summaryrefslogtreecommitdiff
path: root/src/glut/glx/glut_vidresize.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-12-11 15:41:47 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-12-11 15:41:47 +0000
commitb04bcd14ee329a12acc1b7895ee9ac4aa74344e3 (patch)
tree895fd065ba0d6bb553190fe0b58a66bf2568c97e /src/glut/glx/glut_vidresize.c
parent14586916b9b888bec0b08b9646f90e74c0833183 (diff)
minor changes to fix compile problems/warnings
Diffstat (limited to 'src/glut/glx/glut_vidresize.c')
-rw-r--r--src/glut/glx/glut_vidresize.c10
1 files changed, 5 insertions, 5 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);