summaryrefslogtreecommitdiff
path: root/src/glut/glx/glut_win.c
diff options
context:
space:
mode:
authorZou Nan hai <nanhai.zou@intel.com>2007-07-04 10:52:35 +0800
committerZou Nan hai <nanhai.zou@intel.com>2007-07-04 10:52:35 +0800
commitfb9ee9b323bff93973a39560b2bc007aace4bddd (patch)
tree05e1e72e8f4d321cde2c48b8518e6d9736c680dd /src/glut/glx/glut_win.c
parent285b326c606e9b2f90e4fe177b15b3fa23239b86 (diff)
parent7ff4359a3be1278b26950f96ab23014a667af838 (diff)
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
Diffstat (limited to 'src/glut/glx/glut_win.c')
-rw-r--r--src/glut/glx/glut_win.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index 0f48e0ba33..18554b3e97 100644
--- a/src/glut/glx/glut_win.c
+++ b/src/glut/glx/glut_win.c
@@ -349,12 +349,18 @@ getVisualInfoRGB(unsigned int mode)
__glutScreen, list);
}
+#ifndef VisualIDMask
+#define VisualIDMask 0
+#endif
+
static XVisualInfo *
getVisualInfoID(int id)
{
XVisualInfo temp;
int count;
+#if !defined(_WIN32)
temp.visualid = id;
+#endif
return XGetVisualInfo(__glutDisplay, VisualIDMask, &temp, &count);
}