minor changes to fix compile problems/warnings

4 files changed, 9 insertions, 7 deletions

diff --git a/src/glut/glx/glut_vidresize.c b/src/glut/glx/glut_vidresize.c
index 5b82573478..0146a29d8c 100644
--- a/src/glut/glx/glut_vidresize.c
+++ b/src/glut/glx/glut_vidresize.c
@@ -7,10 +7,6 @@
 
 #include <stdlib.h>
 
-#if !defined(_WIN32)
-#include <GL/glx.h>
-#endif
-
 #ifdef __sgi
 #include <dlfcn.h>
 #endif
@@ -20,9 +16,11 @@
 /* Grumble.  The IRIX 6.3 and early IRIX 6.4 OpenGL headers
    support the video resize extension, but failed to define
    GLX_SGIX_video_resize. */
+#if 0
 #ifdef GLX_SYNC_FRAME_SGIX
 #define GLX_SGIX_video_resize 1
 #endif
+#endif
 
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
 static int canVideoResize = -1;
@@ -43,7 +41,7 @@ static int dx = -1, dy = -1, dw = -1, dh = -1;
 static volatile int errorCaught;
 
 /* ARGSUSED */
-static
+static int
 catchXSGIvcErrors(Display * dpy, XErrorEvent * event)
 {
   errorCaught = 1;
@@ -94,6 +92,8 @@ glutVideoResizeGet(GLenum param)
 
         errorCaught = 0;
 
+#if defined(GLX_GLXEXT_PROTOTYPES)
+#endif
         glXQueryChannelDeltasSGIX(__glutDisplay, __glutScreen,
           videoResizeChannel, &dx, &dy, &dw, &dh);
 
diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index 934144f633..d03829c3a1 100644
--- a/src/glut/glx/glut_win.c
+++ b/src/glut/glx/glut_win.c
@@ -398,7 +398,7 @@ __glutDetermineVisual(
   return vis;
 }
 
-void GLUTCALLBACK
+static void GLUTCALLBACK
 __glutDefaultDisplay(void)
 {
   /* XXX Remove the warning after GLUT 3.0. */
diff --git a/src/glut/glx/glutint.h b/src/glut/glx/glutint.h
index f54ca0bd16..82e2465e81 100644
--- a/src/glut/glx/glutint.h
+++ b/src/glut/glx/glutint.h
@@ -22,6 +22,7 @@
 #else
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
 
@@ -671,6 +672,7 @@ extern GLUTwindow *__glutMenuWindow;
 extern GLUTmenu *__glutCurrentMenu;
 extern int __glutWindowListSize;
 extern void (*__glutFreeOverlayFunc) (GLUToverlay *);
+extern void __glutFreeOverlay(GLUToverlay * overlay);
 extern XVisualInfo *__glutDetermineWindowVisual(Bool * treatAsSingle,
   Bool * visAlloced, void **fbc);
 
@@ -703,6 +705,7 @@ extern void __glutPutOnWorkList(GLUTwindow * window,
   int work_mask);
 extern void __glutRegisterEventParser(GLUTeventParser * parser);
 extern void __glutPostRedisplay(GLUTwindow * window, int layerMask);
+extern void handleTimeouts(void);
 
 /* private routines from glut_init.c */
 #if !defined(_WIN32)
diff --git a/src/glut/glx/win32_winproc.c b/src/glut/glx/win32_winproc.c
index 945b7eb9ca..a54bac75fa 100644
--- a/src/glut/glx/win32_winproc.c
+++ b/src/glut/glx/win32_winproc.c
@@ -17,7 +17,6 @@
 extern unsigned __glutMenuButton;
 extern GLUTidleCB __glutIdleFunc;
 extern GLUTtimer *__glutTimerList;
-extern void handleTimeouts(void);
 extern GLUTmenuItem *__glutGetUniqueMenuItem(GLUTmenu * menu, int unique);
 static HMENU __glutHMenu;