[xserver-commit] xserver/include inputstr.h,1.7,1.8 pixmapstr.h,1.3,1.4 scrnintstr.h,1.15,1.16

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv21538

Modified Files:
	inputstr.h pixmapstr.h scrnintstr.h 
Log Message:
stop polluting c++ namespace...


Index: inputstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/inputstr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- inputstr.h	11 Sep 2003 05:12:51 -0000	1.7
+++ inputstr.h	15 Feb 2004 15:16:08 -0000	1.8
@@ -241,7 +241,11 @@
 #define THAW_OTHERS		7
 
 typedef struct _DeviceIntRec {
+#ifdef __cplusplus
+    DeviceRec	c_public;
+#else
     DeviceRec	public;
+#endif
     DeviceIntPtr next;
     TimeStamp	grabTime;
     Bool	startup;		/* true if needs to be turned on at

Index: pixmapstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/pixmapstr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pixmapstr.h	7 Nov 2003 23:29:29 -0000	1.3
+++ pixmapstr.h	15 Feb 2004 15:16:08 -0000	1.4
@@ -54,7 +54,11 @@
 
 typedef struct _Drawable {
     unsigned char	type;	/* DRAWABLE_<type> */
+#ifdef __cplusplus
+    unsigned char	c_class;
+#else
     unsigned char	class;	/* specific to type */
+#endif
     unsigned char	depth;
     unsigned char	bitsPerPixel;
     unsigned long	id;	/* resource id */

Index: scrnintstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/scrnintstr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- scrnintstr.h	12 Feb 2004 18:58:49 -0000	1.15
+++ scrnintstr.h	15 Feb 2004 15:16:08 -0000	1.16
@@ -67,7 +67,11 @@
     
 typedef struct _Visual {
     VisualID		vid;
+#ifdef __cplusplus
+    short		c_class;
+#else
     short		class;
+#endif
     short		bitsPerRGBValue;
     short		ColormapEntries;
     short		nplanes;/* = log2 (ColormapEntries). This does not