Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / glw / GLwDrawA.c

diff --git a/src/glw/GLwDrawA.c b/src/glw/GLwDrawA.c
index 670ddb18edb2510e5f1d7f551cba15b28ec18ef0..30304a40801d168e94538795b138e99fae91167a 100644 (file)
--- a/src/glw/GLwDrawA.c
+++ b/src/glw/GLwDrawA.c
@@ -66,7 +66,7 @@
 #define GLwDrawingAreaRec                GLwMDrawingAreaRec
 #endif 
 
-#define ATTRIBLIST_SIZE 30
+#define ATTRIBLIST_SIZE 32
 
 #define offset(field) XtOffset(GLwDrawingAreaWidget,glwDrawingArea.field)
 
@@ -415,7 +415,6 @@ static void createAttribList(GLwDrawingAreaWidget w){
 
 /* Initialize the visualInfo based on the attribute list */
 static void createVisualInfo(GLwDrawingAreaWidget w){
-  static XVisualInfo *visualInfo;
   assert(w->glwDrawingArea.attribList);
   w->glwDrawingArea.visualInfo=glXChooseVisual(XtDisplay(w),XScreenNumberOfScreen(XtScreen(w)),w->glwDrawingArea.attribList);
   if(!w->glwDrawingArea.visualInfo) error((Widget)w,"requested visual not supported");
@@ -578,7 +577,6 @@ static void Realize(Widget w,Mask *valueMask,XSetWindowAttributes *attributes){
 
 static void Redraw(GLwDrawingAreaWidget w,XEvent *event,Region region){
   GLwDrawingAreaCallbackStruct cb;
-  XtCallbackList cblist;
   if(!XtIsRealized((Widget)w)) return;
   cb.reason=GLwCR_EXPOSE;
   cb.event=event;