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

diff --git a/include/X11/extensions/dri3proto.h b/include/X11/extensions/dri3proto.h
index 51b825d..d1f909b 100644
--- a/include/X11/extensions/dri3proto.h
+++ b/include/X11/extensions/dri3proto.h
@@ -47,59 +47,59 @@
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
+    CARD16  length;
+    CARD32  majorVersion;
+    CARD32  minorVersion;
 } xDRI3QueryVersionReq;
 #define sz_xDRI3QueryVersionReq   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;
 } xDRI3QueryVersionReply;
 #define sz_xDRI3QueryVersionReply	32
 
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  provider B32;
+    CARD16  length;
+    CARD32  drawable;
+    CARD32  provider;
 } xDRI3OpenReq;
 #define sz_xDRI3OpenReq	12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     CARD8   nfd;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-    CARD32  pad7 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+    CARD32  pad7;
 } xDRI3OpenReply;
 #define sz_xDRI3OpenReply	32
 
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  pixmap B32;
-    CARD32  drawable B32;
-    CARD32  size B32;
-    CARD16  width B16;
-    CARD16  height B16;
-    CARD16  stride B16;
+    CARD16  length;
+    CARD32  pixmap;
+    CARD32  drawable;
+    CARD32  size;
+    CARD16  width;
+    CARD16  height;
+    CARD16  stride;
     CARD8   depth;
     CARD8   bpp;
 } xDRI3PixmapFromBufferReq;
@@ -109,37 +109,37 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  pixmap B32;
+    CARD16  length;
+    CARD32  pixmap;
 } xDRI3BufferFromPixmapReq;
 #define sz_xDRI3BufferFromPixmapReq     8
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     CARD8   nfd;    /* Number of file descriptors returned (1) */
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  size B32;
-    CARD16  width B16;
-    CARD16  height B16;
-    CARD16  stride B16;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  size;
+    CARD16  width;
+    CARD16  height;
+    CARD16  stride;
     CARD8   depth;
     CARD8   bpp;
-    CARD32  pad20 B32;
-    CARD32  pad24 B32;
-    CARD32  pad28 B32;
+    CARD32  pad20;
+    CARD32  pad24;
+    CARD32  pad28;
 } xDRI3BufferFromPixmapReply;
 #define sz_xDRI3BufferFromPixmapReply   32
 
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  fence B32;
+    CARD16  length;
+    CARD32  drawable;
+    CARD32  fence;
     BOOL    initially_triggered;
     CARD8   pad13;
-    CARD16  pad14 B16;
+    CARD16  pad14;
 } xDRI3FenceFromFDReq;
 
 #define sz_xDRI3FenceFromFDReq  16
@@ -147,9 +147,9 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  fence B32;
+    CARD16  length;
+    CARD32  drawable;
+    CARD32  fence;
 } xDRI3FDFromFenceReq;
 
 #define sz_xDRI3FDFromFenceReq  12
@@ -157,14 +157,14 @@ typedef struct {
 typedef struct {
     BYTE    type;   /* X_Reply */
     CARD8   nfd;    /* Number of file descriptors returned (1) */
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  pad08 B32;
-    CARD32  pad12 B32;
-    CARD32  pad16 B32;
-    CARD32  pad20 B32;
-    CARD32  pad24 B32;
-    CARD32  pad28 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  pad08;
+    CARD32  pad12;
+    CARD32  pad16;
+    CARD32  pad20;
+    CARD32  pad24;
+    CARD32  pad28;
 } xDRI3FDFromFenceReply;
 
 #define sz_xDRI3FDFromFenceReply   32
@@ -174,50 +174,50 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  window B32;
+    CARD16  length;
+    CARD32  window;
     CARD8   depth;
     CARD8   bpp;
-    CARD16  pad10 B16;
+    CARD16  pad10;
 } xDRI3GetSupportedModifiersReq;
 #define sz_xDRI3GetSupportedModifiersReq     12
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     CARD8   pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  numWindowModifiers B32;
-    CARD32  numScreenModifiers B32;
-    CARD32  pad16 B32;
-    CARD32  pad20 B32;
-    CARD32  pad24 B32;
-    CARD32  pad28 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  numWindowModifiers;
+    CARD32  numScreenModifiers;
+    CARD32  pad16;
+    CARD32  pad20;
+    CARD32  pad24;
+    CARD32  pad28;
 } xDRI3GetSupportedModifiersReply;
 #define sz_xDRI3GetSupportedModifiersReply   32
 
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  pixmap B32;
-    CARD32  window B32;
+    CARD16  length;
+    CARD32  pixmap;
+    CARD32  window;
     CARD8   num_buffers; /* Number of file descriptors passed */
     CARD8   pad13;
-    CARD16  pad14 B16;
-    CARD16  width B16;
-    CARD16  height B16;
-    CARD32  stride0 B32;
-    CARD32  offset0 B32;
-    CARD32  stride1 B32;
-    CARD32  offset1 B32;
-    CARD32  stride2 B32;
-    CARD32  offset2 B32;
-    CARD32  stride3 B32;
-    CARD32  offset3 B32;
+    CARD16  pad14;
+    CARD16  width;
+    CARD16  height;
+    CARD32  stride0;
+    CARD32  offset0;
+    CARD32  stride1;
+    CARD32  offset1;
+    CARD32  stride2;
+    CARD32  offset2;
+    CARD32  stride3;
+    CARD32  offset3;
     CARD8   depth;
     CARD8   bpp;
-    CARD16  pad54 B16;
+    CARD16  pad54;
     CARD64  modifier;
 } xDRI3PixmapFromBuffersReq;
 #define sz_xDRI3PixmapFromBuffersReq 64
@@ -225,24 +225,24 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   dri3ReqType;
-    CARD16  length B16;
-    CARD32  pixmap B32;
+    CARD16  length;
+    CARD32  pixmap;
 } xDRI3BuffersFromPixmapReq;
 #define sz_xDRI3BuffersFromPixmapReq     8
 
 typedef struct {
     BYTE    type;   /* X_Reply */
     CARD8   nfd;    /* Number of file descriptors returned */
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD16  width B16;
-    CARD16  height B16;
-    CARD32  pad12 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD16  width;
+    CARD16  height;
+    CARD32  pad12;
     CARD64  modifier;
     CARD8   depth;
     CARD8   bpp;
-    CARD16  pad26 B16;
-    CARD32  pad28 B32;
+    CARD16  pad26;
+    CARD32  pad28;
 } xDRI3BuffersFromPixmapReply;
 #define sz_xDRI3BuffersFromPixmapReply   32