summaryrefslogtreecommitdiff
path: root/include/X11/extensions/geproto.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2018-06-16 14:34:14 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-10 12:31:50 -0800
commit641db34376d18ed5b76ff8883284bef4898d71be (patch)
tree6005c776825c1a869140b276cea32c839c53c239 /include/X11/extensions/geproto.h
parentaf9b5f43439378efd1e12d11d487a71f42790fec (diff)
Remove the use of no-op B16 & B32 bitfield macros in headers
These have always done nothing on all platforms except CRAY. As https://bugs.freedesktop.org/show_bug.cgi?id=45202 points out we don't even detect when they've been wrong for decades. Performed via: find include -name '*.h' | grep -v md.h | xargs perl -i -p -e 's{\s+B\d+}{}g' followed by manual whitespace fixups to preserve visual alignment. The #defines for B16 & B32 are left in place to preserve compatibility in any code that used them outside the xorgproto repo. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Keith Packard <keithp@keithp.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'include/X11/extensions/geproto.h')
-rw-r--r--include/X11/extensions/geproto.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/X11/extensions/geproto.h b/include/X11/extensions/geproto.h
index c8860dd..7b34be2 100644
--- a/include/X11/extensions/geproto.h
+++ b/include/X11/extensions/geproto.h
@@ -50,7 +50,7 @@
typedef struct {
CARD8 reqType;
CARD8 ReqType;
- CARD16 length B16;
+ CARD16 length;
} xGEReq;
@@ -58,9 +58,9 @@ typedef struct {
typedef struct {
CARD8 reqType; /* input extension major code */
CARD8 ReqType; /* always X_GEQueryVersion */
- CARD16 length B16;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
+ CARD16 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
} xGEQueryVersionReq;
#define sz_xGEQueryVersionReq 8
@@ -68,15 +68,15 @@ typedef struct {
typedef struct {
CARD8 repType; /* X_Reply */
CARD8 RepType; /* always X_GEQueryVersion */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad00;
+ CARD32 pad01;
+ CARD32 pad02;
+ CARD32 pad03;
+ CARD32 pad04;
} xGEQueryVersionReply;
#define sz_xGEQueryVersionReply 32