summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-03-24 15:59:44 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-03-24 15:59:44 +0000
commitfda7215db36ddee1900cab38b1435f1d73ac7858 (patch)
treecd1198f76c1acba55d8511108f5d1947702ba26a /include
parentae608522067dce62c6c9afa9780c58b1dd13753e (diff)
rename class to c_class if using C++ (bug 922294)
Diffstat (limited to 'include')
-rw-r--r--include/GL/miniglx.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/GL/miniglx.h b/include/GL/miniglx.h
index 4416e587d6..8c246a05cf 100644
--- a/include/GL/miniglx.h
+++ b/include/GL/miniglx.h
@@ -1,4 +1,4 @@
-/* $Id: miniglx.h,v 1.2 2003/12/06 17:17:42 brianp Exp $ */
+/* $Id: miniglx.h,v 1.3 2004/03/24 15:59:44 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -87,7 +87,11 @@ typedef struct MiniGLXXVisualInfoRec {
VisualID visualid; /**< \brief visual ID */
int screen; /**< \brief screen number */
int depth; /**< \brief bit depth */
+#if defined(__cplusplus) || defined(c_plusplus)
+ int c_class; /**< \brief class */
+#else
int class; /**< \brief class */
+#endif
int bits_per_rgb; /**< \brief total bits per pixel */
} XVisualInfo;
@@ -333,7 +337,7 @@ XCloseDisplay( Display *display );
extern Window
XCreateWindow( Display *display, Window parent, int x, int y,
unsigned int width, unsigned int height,
- unsigned int border_width, int depth, unsigned int class,
+ unsigned int border_width, int depth, unsigned int winclass,
Visual *visual, unsigned long valuemask,
XSetWindowAttributes *attributes );