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

diff --git a/include/X11/extensions/dbeproto.h b/include/X11/extensions/dbeproto.h
index 784926e..d6f7123 100644
--- a/include/X11/extensions/dbeproto.h
+++ b/include/X11/extensions/dbeproto.h
@@ -54,32 +54,32 @@ typedef CARD32 xDbeBackBuffer;
 
 typedef struct
 {
-    CARD32		window B32;	/* window      */
+    CARD32		window;		/* window      */
     xDbeSwapAction	swapAction;	/* swap action */
     CARD8		pad1;		/* unused      */
-    CARD16		pad2 B16;
+    CARD16		pad2;
 
 } xDbeSwapInfo;
 
 typedef struct
 {
-    CARD32	visualID B32;	/* associated visual      */
+    CARD32	visualID;	/* associated visual      */
     CARD8	depth;		/* depth of visual        */
     CARD8	perfLevel;	/* performance level hint */
-    CARD16	pad1 B16;
+    CARD16	pad1;
 
 } xDbeVisInfo;
 #define sz_xDbeVisInfo	8
 
 typedef struct
 {
-    CARD32	n B32;	/* number of visual info items in list  */
+    CARD32	n;	/* number of visual info items in list  */
 
 } xDbeScreenVisInfo;	/* followed by n xDbeVisInfo items */
 
 typedef struct
 {
-    CARD32	window B32;	/* window */
+    CARD32	window;		/* window */
 
 } xDbeBufferAttributes;
 
@@ -90,10 +90,10 @@ typedef struct
 {
     CARD8	reqType;	/* major-opcode: always codes->major_opcode */
     CARD8	dbeReqType;	/* minor-opcode: always X_DbeGetVersion (0) */
-    CARD16	length B16;	/* request length: (2)                      */
+    CARD16	length;		/* request length: (2)                      */
     CARD8	majorVersion;	/* client-major-version                     */
     CARD8	minorVersion;	/* client-minor-version                     */
-    CARD16	unused B16;	/* unused                                   */
+    CARD16	unused;		/* unused                                   */
 
 } xDbeGetVersionReq;
 #define sz_xDbeGetVersionReq	8
@@ -102,16 +102,16 @@ typedef struct
 {
     BYTE	type;			/* Reply: X_Reply (1)   */
     CARD8	unused;			/* unused               */
-    CARD16	sequenceNumber B16;	/* sequence number      */
-    CARD32	length B32;		/* reply length: (0)    */
+    CARD16	sequenceNumber;		/* sequence number      */
+    CARD32	length;			/* reply length: (0)    */
     CARD8	majorVersion;		/* server-major-version */
     CARD8	minorVersion;		/* server-minor-version */
-    CARD16	pad1 B16;		/* unused               */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	pad1;			/* unused               */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 
 } xDbeGetVersionReply;
 #define sz_xDbeGetVersionReply	32
@@ -120,12 +120,12 @@ typedef struct
 {
     CARD8		reqType;	/* major-opcode: codes->major_opcode */
     CARD8		dbeReqType;	/* X_DbeAllocateBackBufferName (1)   */
-    CARD16		length B16;	/* request length: (4)               */
-    CARD32		window B32;	/* window                            */
-    xDbeBackBuffer	buffer B32;	/* back buffer name                  */
+    CARD16		length;		/* request length: (4)               */
+    CARD32		window;		/* window                            */
+    xDbeBackBuffer	buffer;		/* back buffer name                  */
     xDbeSwapAction	swapAction;	/* swap action hint                  */
     CARD8		pad1;		/* unused                            */
-    CARD16		pad2 B16;
+    CARD16		pad2;
 
 } xDbeAllocateBackBufferNameReq;
 #define sz_xDbeAllocateBackBufferNameReq	16
@@ -134,8 +134,8 @@ typedef struct
 {
     CARD8		reqType;	/* major-opcode: codes->major_opcode */
     CARD8		dbeReqType;	/* X_DbeDeallocateBackBufferName (2) */
-    CARD16		length B16;	/* request length: (2)               */
-    xDbeBackBuffer	buffer B32;	/* back buffer name                  */
+    CARD16		length;		/* request length: (2)               */
+    xDbeBackBuffer	buffer;		/* back buffer name                  */
 
 } xDbeDeallocateBackBufferNameReq;
 #define sz_xDbeDeallocateBackBufferNameReq	8
@@ -144,8 +144,8 @@ typedef struct
 {
     CARD8	reqType;	/* major-opcode: always codes->major_opcode  */
     CARD8	dbeReqType;	/* minor-opcode: always X_DbeSwapBuffers (3) */
-    CARD16	length B16;	/* request length: (2+2n)                    */
-    CARD32	n B32;		/* n, number of window/swap action pairs     */
+    CARD16	length;		/* request length: (2+2n)                    */
+    CARD32	n;		/* n, number of window/swap action pairs     */
 
 } xDbeSwapBuffersReq;		/* followed by n window/swap action pairs    */
 #define sz_xDbeSwapBuffersReq	8
@@ -154,7 +154,7 @@ typedef struct
 {
     CARD8	reqType;	/* major-opcode: always codes->major_opcode */
     CARD8	dbeReqType;	/* minor-opcode: always X_DbeBeginIdom (4)  */
-    CARD16	length B16;	/* request length: (1)                      */
+    CARD16	length;		/* request length: (1)                      */
 
 } xDbeBeginIdiomReq;
 #define sz_xDbeBeginIdiomReq	4
@@ -163,7 +163,7 @@ typedef struct
 {
     CARD8	reqType;	/* major-opcode: always codes->major_opcode */
     CARD8	dbeReqType;	/* minor-opcode: always X_DbeEndIdom (5)    */
-    CARD16	length B16;	/* request length: (1)                      */
+    CARD16	length;		/* request length: (1)                      */
 
 } xDbeEndIdiomReq;
 #define sz_xDbeEndIdiomReq	4
@@ -172,8 +172,8 @@ typedef struct
 {
     CARD8	reqType;	/* always codes->major_opcode     */
     CARD8	dbeReqType;	/* always X_DbeGetVisualInfo (6)  */
-    CARD16	length B16;	/* request length: (2+n)          */
-    CARD32	n B32;		/* n, number of drawables in list */
+    CARD16	length;		/* request length: (2+n)          */
+    CARD32	n;		/* n, number of drawables in list */
 
 } xDbeGetVisualInfoReq;		/* followed by n drawables        */
 #define sz_xDbeGetVisualInfoReq	8
@@ -182,14 +182,14 @@ typedef struct
 {
     BYTE	type;			/* Reply: X_Reply (1)                */
     CARD8	unused;			/* unused                            */
-    CARD16	sequenceNumber B16;	/* sequence number                   */
-    CARD32	length B32;		/* reply length                      */
+    CARD16	sequenceNumber;		/* sequence number                   */
+    CARD32	length;			/* reply length                      */
     CARD32	m;			/* m, number of visual infos in list */
-    CARD32	pad1 B32;		/* unused                            */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD32	pad1;			/* unused                            */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 
 } xDbeGetVisualInfoReply;		/* followed by m visual infos        */
 #define sz_xDbeGetVisualInfoReply	32
@@ -198,8 +198,8 @@ typedef struct
 {
     CARD8		reqType;	/* always codes->major_opcode       */
     CARD8		dbeReqType;	/* X_DbeGetBackBufferAttributes (7) */
-    CARD16		length B16;	/* request length: (2)              */
-    xDbeBackBuffer	buffer B32;	/* back buffer name                 */
+    CARD16		length;		/* request length: (2)              */
+    xDbeBackBuffer	buffer;		/* back buffer name                 */
 
 } xDbeGetBackBufferAttributesReq;
 #define sz_xDbeGetBackBufferAttributesReq	8
@@ -208,14 +208,14 @@ typedef struct
 {
     BYTE	type;			/* Reply: X_Reply (1) */
     CARD8	unused;			/* unused             */
-    CARD16	sequenceNumber B16;	/* sequence number    */
-    CARD32	length B32;		/* reply length: (0)  */
+    CARD16	sequenceNumber;		/* sequence number    */
+    CARD32	length;			/* reply length: (0)  */
     CARD32	attributes;		/* attributes         */
-    CARD32	pad1 B32;		/* unused             */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD32	pad1;			/* unused             */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 
 } xDbeGetBackBufferAttributesReply;
 #define sz_xDbeGetBackBufferAttributesReply	32