Hi,

I'm bitten by this issue too and I'm somewhat lost with this. The patch has not yet been applied or commented on xorg, so I just want to make sure it's seen.

[email protected] wrote:
Just noticed that I created the reverse patch.  Here to correct one.


Hey Everyone,

I found a bug in Xextproto that break QT.  QT fails to compile because
of namespace pollution from <X11/Xmd.h>.  It's the same problem that
inputproto had, which Adam Jackson fixed with git commit
b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9.

I created and successfully tested the attached patch.  It's based on
the the Adam's fix for inputproto.  With this patch, I was able to
compile and install QT.

------------------------------------------------------------------------

_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg

diff --git a/Xge.h b/Xge.h
index cc03ece..51382ff 100644
--- a/Xge.h
+++ b/Xge.h
@@ -30,7 +30,6 @@
 #ifndef _XGE_H_
 #define _XGE_H_
 
-#include <X11/Xmd.h>
 #include <X11/Xlib.h>
 #include <X11/Xfuncproto.h>
 
@@ -39,12 +38,15 @@ _XFUNCPROTOBEGIN
 /**
  * Generic Event mask. 
  * To be used whenever a list of masks per extension has to be provided.
+ *
+ * But, don't actually use the CARD{8,16,32} types.  We can't get them them
+ * defined here without polluting the namespace.
  */
 typedef struct {
-    CARD8       extension;
-    CARD8       pad0;
-    CARD16      pad1;
-    CARD32      evmask;
+    unsigned char       extension;
+    unsigned char       pad0;
+    unsigned short      pad1;
+    unsigned int      evmask;
 } XGenericEventMask;
 
 Bool XGEQueryExtension(Display* dpy, int *event_basep, int *err_basep);
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg

Reply via email to