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, 87 insertions, 87 deletions

diff --git a/include/X11/extensions/presentproto.h b/include/X11/extensions/presentproto.h
index eb2bb96..d8dc6d2 100644
--- a/include/X11/extensions/presentproto.h
+++ b/include/X11/extensions/presentproto.h
@@ -32,55 +32,55 @@
 #define EventID CARD32
 
 typedef struct {
-    Window  window B32;
-    CARD32  serial B32;
+    Window  window;
+    CARD32  serial;
 } xPresentNotify;
 #define sz_xPresentNotify               8
 
 typedef struct {
     CARD8   reqType;
     CARD8   presentReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
+    CARD16  length;
+    CARD32  majorVersion;
+    CARD32  minorVersion;
 } xPresentQueryVersionReq;
 #define sz_xPresentQueryVersionReq   12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  majorVersion;
+    CARD32  minorVersion;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
 } xPresentQueryVersionReply;
 #define sz_xPresentQueryVersionReply	32
 
 typedef struct {
     CARD8   reqType;
     CARD8   presentReqType;
-    CARD16  length B16;
-    Window  window B32;
+    CARD16  length;
+    Window  window;
 
-    Pixmap  pixmap B32;
-    CARD32  serial B32;
+    Pixmap  pixmap;
+    CARD32  serial;
 
-    Region  valid B32;
-    Region  update B32;
+    Region  valid;
+    Region  update;
 
-    INT16   x_off B16;
-    INT16   y_off B16;
-    CARD32  target_crtc B32;
+    INT16   x_off;
+    INT16   y_off;
+    CARD32  target_crtc;
 
-    XSyncFence wait_fence B32;
-    XSyncFence idle_fence B32;
+    XSyncFence wait_fence;
+    XSyncFence idle_fence;
 
-    CARD32  options B32;
-    CARD32  pad1 B32;
+    CARD32  options;
+    CARD32  pad1;
 
     CARD64  target_msc;
     CARD64  divisor;
@@ -92,11 +92,11 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   presentReqType;
-    CARD16  length B16;
-    Window  window B32;
+    CARD16  length;
+    Window  window;
 
-    CARD32  serial B32;
-    CARD32  pad0 B32;
+    CARD32  serial;
+    CARD32  pad0;
 
     CARD64  target_msc;
     CARD64  divisor;
@@ -107,32 +107,32 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   presentReqType;
-    CARD16  length B16;
-    CARD32  eid B32;
-    CARD32  window B32;
-    CARD32  eventMask B32;
+    CARD16  length;
+    CARD32  eid;
+    CARD32  window;
+    CARD32  eventMask;
 } xPresentSelectInputReq;
 #define sz_xPresentSelectInputReq   16
 
 typedef struct {
     CARD8   reqType;
     CARD8   presentReqType;
-    CARD16  length B16;
-    CARD32  target B32;
+    CARD16  length;
+    CARD32  target;
 } xPresentQueryCapabilitiesReq;
 #define sz_xPresentQueryCapabilitiesReq   8
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  capabilities B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-    CARD32  pad7 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  capabilities;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+    CARD32  pad7;
 } xPresentQueryCapabilitiesReply;
 #define sz_xPresentQueryCapabilitiesReply       32
 
@@ -145,36 +145,36 @@ typedef struct {
 typedef struct {
     CARD8 type;
     CARD8 extension;
-    CARD16 sequenceNumber B16;
+    CARD16 sequenceNumber;
     CARD32 length;
-    CARD16 evtype B16;
+    CARD16 evtype;
     CARD16 pad2;
-    CARD32 eid B32;
-    CARD32 window B32;
-    INT16  x B16;
-    INT16  y B16;
-    CARD16 width B16;
-    CARD16 height B16;
-    INT16  off_x B16;
-    INT16  off_y B16;
-
-    CARD16 pixmap_width B16;
-    CARD16 pixmap_height B16;
-    CARD32 pixmap_flags B32;
+    CARD32 eid;
+    CARD32 window;
+    INT16  x;
+    INT16  y;
+    CARD16 width;
+    CARD16 height;
+    INT16  off_x;
+    INT16  off_y;
+
+    CARD16 pixmap_width;
+    CARD16 pixmap_height;
+    CARD32 pixmap_flags;
 } xPresentConfigureNotify;
 #define sz_xPresentConfigureNotify 40
 
 typedef struct {
     CARD8 type;
     CARD8 extension;
-    CARD16 sequenceNumber B16;
+    CARD16 sequenceNumber;
     CARD32 length;
-    CARD16 evtype B16;
+    CARD16 evtype;
     CARD8  kind;
     CARD8  mode;
-    CARD32 eid B32;
-    Window window B32;
-    CARD32 serial B32;
+    CARD32 eid;
+    Window window;
+    CARD32 serial;
     CARD64 ust;
 
     CARD64 msc;
@@ -184,15 +184,15 @@ typedef struct {
 typedef struct {
     CARD8 type;
     CARD8 extension;
-    CARD16 sequenceNumber B16;
+    CARD16 sequenceNumber;
     CARD32 length;
-    CARD16 evtype B16;
-    CARD16 pad2 B16;
-    CARD32 eid B32;
-    Window window B32;
-    CARD32 serial B32;
-    Pixmap pixmap B32;
-    CARD32 idle_fence B32;
+    CARD16 evtype;
+    CARD16 pad2;
+    CARD32 eid;
+    Window window;
+    CARD32 serial;
+    Pixmap pixmap;
+    CARD32 idle_fence;
 } xPresentIdleNotify;
 #define sz_xPresentIdleNotify   32
 
@@ -200,35 +200,35 @@ typedef struct {
 typedef struct {
     CARD8 type;
     CARD8 extension;
-    CARD16 sequenceNumber B16;
+    CARD16 sequenceNumber;
     CARD32 length;
-    CARD16 evtype B16;
+    CARD16 evtype;
     CARD8 update_window;
     CARD8 pad1;
-    CARD32 eid B32;
-    Window event_window B32;
-    Window window B32;
-    Pixmap pixmap B32;
-    CARD32 serial B32;
+    CARD32 eid;
+    Window event_window;
+    Window window;
+    Pixmap pixmap;
+    CARD32 serial;
 
     /* 32-byte boundary */
 
-    Region valid_region B32;
-    Region update_region B32;
+    Region valid_region;
+    Region update_region;
 
     xRectangle valid_rect;
 
     xRectangle update_rect;
 
-    INT16 x_off B16;
-    INT16 y_off B16;
-    CARD32 target_crtc B32;
+    INT16 x_off;
+    INT16 y_off;
+    CARD32 target_crtc;
 
-    XSyncFence wait_fence B32;
-    XSyncFence idle_fence B32;
+    XSyncFence wait_fence;
+    XSyncFence idle_fence;
 
-    CARD32 options B32;
-    CARD32 pad2 B32;
+    CARD32 options;
+    CARD32 pad2;
 
     CARD64 target_msc;
     CARD64 divisor;