summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-03-06 12:59:24 +0000
committerJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-03-06 12:59:24 +0000
commit3f600e47cf36080abbc00a1f08c7e80fd5137a67 (patch)
treeaac55236d64eb7e8ab043d1ae001df2e39fb3971 /include
parent0223baaf578598454a36cfdfd7fbeff3358f40ce (diff)
Committing in .
VMS : C++ & Xlib.h problems. Modified Files: Mesa/include/GL/glx.h ----------------------------------------------------------------------
Diffstat (limited to 'include')
-rw-r--r--include/GL/glx.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/GL/glx.h b/include/GL/glx.h
index e3a580bc81..fcea293f9b 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.14 2000/03/03 15:35:51 brianp Exp $ */
+/* $Id: glx.h,v 1.15 2000/03/06 12:59:24 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -30,8 +30,20 @@
#define GLX_H
+#ifdef __VMS
+# ifdef __cplusplus
+/* VMS Xlib.h gives problems with C++.
+ * this avoids a bunch of trivial warnings */
+#pragma message disable nosimpint
+#endif
+#endif
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#ifdef __VMS
+# ifdef __cplusplus
+#pragma message enable nosimpint
+#endif
+#endif
#include "GL/gl.h"
#ifdef MESA
#include "GL/xmesa.h"