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>

1 files changed, 15 insertions, 15 deletions

diff --git a/include/X11/extensions/lgewire.h b/include/X11/extensions/lgewire.h
index 4e5a036..ba40bd6 100644
--- a/include/X11/extensions/lgewire.h
+++ b/include/X11/extensions/lgewire.h
@@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group.
 typedef struct {
     CARD8       reqType;
     CARD8       lgeReqType;
-    CARD16	length B16;
+    CARD16	length;
 } xLgeQueryVersionReq;
 
 #define sz_xLgeQueryVersionReq	sizeof(xLgeQueryVersionReq)
@@ -63,14 +63,14 @@ typedef struct {
     /* Always X_Reply */
     BYTE        type;
     CARD8       unused;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	majorVersion B32;
-    CARD32	minorVersion B32;
-    CARD32      implementation B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	majorVersion;
+    CARD32	minorVersion;
+    CARD32	implementation;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xLgeQueryVersionReply;
 
 #define sz_xLgeQueryVersionReply sizeof(xLgeQueryVersionReply)
@@ -78,10 +78,10 @@ typedef struct {
 typedef struct {
     CARD8  reqType;
     CARD8  lgeReqType;
-    CARD16 length B16;
+    CARD16 length;
     CARD8  clientType;
     BOOL   sendEventDirect;
-    CARD16 pad2 B16;
+    CARD16 pad2;
 } xLgeRegisterClientReq;
 
 #define sz_xLgeRegisterClientReq sizeof(xLgeRegisterClientReq)
@@ -89,7 +89,7 @@ typedef struct {
 typedef struct {
     CARD8  reqType;
     CARD8  lgeReqType;
-    CARD16 length B16;
+    CARD16 length;
     /* The pseudo-root window of the screen */
     Window prw;
 } xLgeRegisterScreenReq;
@@ -99,10 +99,10 @@ typedef struct {
 typedef struct {
     CARD8     reqType;
     CARD8     lgeReqType;
-    CARD16    length B16;
+    CARD16    length;
     BOOL      enable;
     CARD8     pad1;
-    CARD16    pad2 B16;
+    CARD16    pad2;
 } xLgeControlLgModeReq;
 
 #define sz_xLgeControlLgModeReq sizeof(xLgeControlLgModeReq)
@@ -110,7 +110,7 @@ typedef struct {
 typedef struct {
     CARD8     reqType;
     CARD8     lgeReqType;
-    CARD16    length B16;
+    CARD16    length;
     xEvent    event;
 } xLgeSendEventReq;