From 3f600e47cf36080abbc00a1f08c7e80fd5137a67 Mon Sep 17 00:00:00 2001
From: Jouk Jansen <joukj@hrem.stm.tudelft.nl>
Date: Mon, 6 Mar 2000 12:59:24 +0000
Subject:  Committing in .

 VMS : C++ & Xlib.h problems.

 Modified Files:
 	Mesa/include/GL/glx.h
 ----------------------------------------------------------------------
---
 include/GL/glx.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'include/GL/glx.h')

diff --git a/include/GL/glx.h b/include/GL/glx.h
index e3a580bc814..fcea293f9b9 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"
-- 
cgit v1.2.3