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

diff --git a/include/X11/extensions/multibufproto.h b/include/X11/extensions/multibufproto.h
index e2184d3..19a6401 100644
--- a/include/X11/extensions/multibufproto.h
+++ b/include/X11/extensions/multibufproto.h
@@ -50,8 +50,8 @@ in this Software without prior written authorization from The Open Group.
 
 
 typedef struct xMbufBufferInfo {
-	CARD32	visualID B32;		/* associated visual */
-	CARD16	maxBuffers B16;		/* maximum supported buffers */
+	CARD32	visualID;		/* associated visual */
+	CARD16	maxBuffers;		/* maximum supported buffers */
 	CARD8	depth;			/* depth of visual (redundant) */
 	CARD8	unused;
 } xMbufBufferInfo;
@@ -60,60 +60,60 @@ typedef struct xMbufBufferInfo {
 typedef struct {
     BYTE    type;
     BYTE    unused;
-    CARD16  sequenceNumber B16;
-    CARD32  buffer B32;			/* affected buffer */
+    CARD16  sequenceNumber;
+    CARD32  buffer;			/* affected buffer */
     BYTE    state;			/* current status */
     CARD8   unused1;
-    CARD16  unused2 B16;
-    CARD32  unused3 B32;
-    CARD32  unused4 B32;
-    CARD32  unused5 B32;
-    CARD32  unused6 B32;
-    CARD32  unused7 B32;
+    CARD16  unused2;
+    CARD32  unused3;
+    CARD32  unused4;
+    CARD32  unused5;
+    CARD32  unused6;
+    CARD32  unused7;
 } xMbufClobberNotifyEvent;
 
 typedef struct {
     BYTE    type;
     BYTE    unused;
-    CARD16  sequenceNumber B16;
-    CARD32  buffer B32;			/* affected buffer */
-    CARD32  timeStamp B32;		/* update time */
-    CARD32  unused1 B32;
-    CARD32  unused2 B32;
-    CARD32  unused3 B32;
-    CARD32  unused4 B32;
-    CARD32  unused5 B32;
-    CARD32  unused6 B32;
+    CARD16  sequenceNumber;
+    CARD32  buffer;			/* affected buffer */
+    CARD32  timeStamp;			/* update time */
+    CARD32  unused1;
+    CARD32  unused2;
+    CARD32  unused3;
+    CARD32  unused4;
+    CARD32  unused5;
+    CARD32  unused6;
 } xMbufUpdateNotifyEvent;
 
 typedef struct {
     CARD8	reqType;		/* always codes->major_opcode */
     CARD8	mbufReqType;		/* always X_MbufGetBufferVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xMbufGetBufferVersionReq;
 #define sz_xMbufGetBufferVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
     CARD8	majorVersion;	/* major version of Multi-Buffering protocol */
     CARD8	minorVersion;	/* minor version of Multi-Buffering protocol */
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xMbufGetBufferVersionReply;
 #define sz_xMbufGetBufferVersionReply	32
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufCreateImageBuffers */
-    CARD16	length B16;
-    CARD32	window B32;	/* associated window */
+    CARD16	length;
+    CARD32	window; 	/* associated window */
     CARD8	updateAction;	/* action at update */
     CARD8	updateHint;	/* hint as to frequency of updates */
     CARD16	unused;
@@ -123,123 +123,123 @@ typedef struct {
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	numberBuffer B16;	/* number successfully allocated */
-    CARD16	unused1 B16;
-    CARD32	unused2 B32;
-    CARD32	unused3 B32;
-    CARD32	unused4 B32;
-    CARD32	unused5 B32;
-    CARD32	unused6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	numberBuffer;		/* number successfully allocated */
+    CARD16	unused1;
+    CARD32	unused2;
+    CARD32	unused3;
+    CARD32	unused4;
+    CARD32	unused5;
+    CARD32	unused6;
 } xMbufCreateImageBuffersReply;
 #define sz_xMbufCreateImageBuffersReply 32
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufDestroyImageBuffers */
-    CARD16	length B16;
-    CARD32	window B32;	/* associated window */
+    CARD16	length;
+    CARD32	window; 	/* associated window */
 } xMbufDestroyImageBuffersReq;
 #define sz_xMbufDestroyImageBuffersReq	8
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufDisplayImageBuffers */
-    CARD16	length B16;
-    CARD16	minDelay B16;	/* minimum time between last update and now */
-    CARD16	maxDelay B16;	/* maximum time between last update and now */
+    CARD16	length;
+    CARD16	minDelay;	/* minimum time between last update and now */
+    CARD16	maxDelay;	/* maximum time between last update and now */
 } xMbufDisplayImageBuffersReq;	/* followed by list of buffers */
 #define sz_xMbufDisplayImageBuffersReq	8
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufSetMBufferAttributes */
-    CARD16	length B16;
-    CARD32	window B32;	/* associated window */
-    CARD32	valueMask B32;	/* modified entries */
+    CARD16	length;
+    CARD32	window; 	/* associated window */
+    CARD32	valueMask;	/* modified entries */
 } xMbufSetMBufferAttributesReq;	/* followed by values */
 #define sz_xMbufSetMBufferAttributesReq 12
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufGetMBufferAttributes */
-    CARD16	length B16;
-    CARD32	window B32;	/* associated window */
+    CARD16	length;
+    CARD32	window; 	/* associated window */
 } xMbufGetMBufferAttributesReq;
 #define sz_xMbufGetMBufferAttributesReq 8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	displayedBuffer B16;	/* currently visible buffer */
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	displayedBuffer;	/* currently visible buffer */
     CARD8	updateAction;
     CARD8	updateHint;
     CARD8	windowMode;
     CARD8	unused0;
-    CARD16	unused1 B16;
-    CARD32	unused2 B32;
-    CARD32	unused3 B32;
-    CARD32	unused4 B32;
-    CARD32	unused5 B32;
+    CARD16	unused1;
+    CARD32	unused2;
+    CARD32	unused3;
+    CARD32	unused4;
+    CARD32	unused5;
 } xMbufGetMBufferAttributesReply;
 #define sz_xMbufGetMBufferAttributesReply 32
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufSetBufferAttributes */
-    CARD16	length B16;
-    CARD32	buffer B32;
-    CARD32	valueMask B32;
+    CARD16	length;
+    CARD32	buffer;
+    CARD32	valueMask;
 } xMbufSetBufferAttributesReq;	/* followed by values */
 #define sz_xMbufSetBufferAttributesReq 12
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufGetBufferAttributes */
-    CARD16	length B16;
-    CARD32	buffer B32;
+    CARD16	length;
+    CARD32	buffer;
 } xMbufGetBufferAttributesReq;
 #define sz_xMbufGetBufferAttributesReq 8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	window B32;
-    CARD32	eventMask B32;
-    CARD16	bufferIndex B16;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	window;
+    CARD32	eventMask;
+    CARD16	bufferIndex;
     CARD8	side;
     CARD8	unused0;
-    CARD32	unused1 B32;
-    CARD32	unused2 B32;
-    CARD32	unused3 B32;
+    CARD32	unused1;
+    CARD32	unused2;
+    CARD32	unused3;
 } xMbufGetBufferAttributesReply;
 #define sz_xMbufGetBufferAttributesReply 32
 
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufGetBufferInfo */
-    CARD16	length B16;
-    Drawable	drawable B32;
+    CARD16	length;
+    Drawable	drawable;
 } xMbufGetBufferInfoReq;
 #define sz_xMbufGetBufferInfoReq 8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	unused;			/* not used */
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	normalInfo B16;
-    CARD16	stereoInfo B16;
-    CARD32	unused1 B32;
-    CARD32	unused2 B32;
-    CARD32	unused3 B32;
-    CARD32	unused4 B32;
-    CARD32	unused5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	normalInfo;
+    CARD16	stereoInfo;
+    CARD32	unused1;
+    CARD32	unused2;
+    CARD32	unused3;
+    CARD32	unused4;
+    CARD32	unused5;
 } xMbufGetBufferInfoReply;			/* followed by buffer infos */
 #define sz_xMbufGetBufferInfoReply 32
 
@@ -247,39 +247,39 @@ typedef struct {
 typedef struct {
     CARD8	reqType;	/* always codes->major_opcode */
     CARD8	mbufReqType;	/* always X_MbufCreateStereoWindow */
-    CARD16	length B16;
+    CARD16	length;
     CARD8	unused0;
     CARD8	unused1;
     CARD8	unused2;
     CARD8	depth;
-    Window	wid B32;
-    Window	parent B32;
-    Multibuffer	left B32;	/* associated buffers */
-    Multibuffer	right B32;
-    INT16	x B16;
-    INT16	y B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	borderWidth B16;
+    Window	wid;
+    Window	parent;
+    Multibuffer	left;		/* associated buffers */
+    Multibuffer	right;
+    INT16	x;
+    INT16	y;
+    CARD16	width;
+    CARD16	height;
+    CARD16	borderWidth;
 #if defined(__cplusplus) || defined(c_plusplus)
-    CARD16	c_class B16;
+    CARD16	c_class;
 #else
-    CARD16	class B16;
+    CARD16	class;
 #endif
-    VisualID	visual B32;
-    CARD32	mask B32;
+    VisualID	visual;
+    CARD32	mask;
 } xMbufCreateStereoWindowReq;		/* followed by value list */
 #define sz_xMbufCreateStereoWindowReq 44
 
 typedef struct {
     CARD8     reqType;        /* always codes->major_opcode */
     CARD8     mbufReqType;    /* always X_MbufClearImageBufferArea */
-    CARD16    length B16;
-    Multibuffer       buffer B32;
-    INT16     x B16;
-    INT16     y B16;
-    CARD16    width B16;
-    CARD16    height B16;
+    CARD16    length;
+    Multibuffer       buffer;
+    INT16     x;
+    INT16     y;
+    CARD16    width;
+    CARD16    height;
     CARD8     unused0;
     CARD8     unused1;
     CARD8     unused2;