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

diff --git a/include/X11/extensions/xf86mscstr.h b/include/X11/extensions/xf86mscstr.h
index 9eab965..cc0f0cf 100644
--- a/include/X11/extensions/xf86mscstr.h
+++ b/include/X11/extensions/xf86mscstr.h
@@ -19,22 +19,22 @@
 typedef struct _XF86MiscQueryVersion {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86MiscQueryVersionReq;
 #define sz_xXF86MiscQueryVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of XFree86-Misc */
-    CARD16	minorVersion B16;	/* minor version of XFree86-Misc */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;		/* major version of XFree86-Misc */
+    CARD16	minorVersion;		/* minor version of XFree86-Misc */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86MiscQueryVersionReply;
 #define sz_xXF86MiscQueryVersionReply	32
 
@@ -42,34 +42,34 @@ typedef struct {
 typedef struct _XF86MiscGetSaver {
     CARD8       reqType;                /* always XF86MiscReqCode */
     CARD8       xf86miscReqType;     /* always X_XF86MiscGetSaver */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
 } xXF86MiscGetSaverReq;
 #define sz_xXF86MiscGetSaverReq	8
 
 typedef struct _XF86MiscSetSaver {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscSetSaver */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	suspendTime B32;
-    CARD32	offTime B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	suspendTime;
+    CARD32	offTime;
 } xXF86MiscSetSaverReq;
 #define sz_xXF86MiscSetSaverReq	16
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	suspendTime B32;
-    CARD32	offTime B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	suspendTime;
+    CARD32	offTime;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xXF86MiscGetSaverReply;
 #define sz_xXF86MiscGetSaverReply	32
 #endif
@@ -77,161 +77,161 @@ typedef struct {
 typedef struct _XF86MiscGetMouseSettings {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscGetMouseSettings */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86MiscGetMouseSettingsReq;
 #define sz_xXF86MiscGetMouseSettingsReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	mousetype B32;
-    CARD32	baudrate B32;
-    CARD32	samplerate B32;
-    CARD32	resolution B32;
-    CARD32	buttons B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	mousetype;
+    CARD32	baudrate;
+    CARD32	samplerate;
+    CARD32	resolution;
+    CARD32	buttons;
     BOOL	emulate3buttons;
     BOOL	chordmiddle;
-    CARD16	pad2 B16;
-    CARD32	emulate3timeout B32;
-    CARD32	flags B32;
-    CARD32	devnamelen B32;		/* strlen(device)+1 */
+    CARD16	pad2;
+    CARD32	emulate3timeout;
+    CARD32	flags;
+    CARD32	devnamelen;		/* strlen(device)+1 */
 } xXF86MiscGetMouseSettingsReply;
 #define sz_xXF86MiscGetMouseSettingsReply	44
 
 typedef struct _XF86MiscGetKbdSettings {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscGetKbdSettings */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86MiscGetKbdSettingsReq;
 #define sz_xXF86MiscGetKbdSettingsReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	kbdtype B32;
-    CARD32	rate B32;
-    CARD32	delay B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	kbdtype;
+    CARD32	rate;
+    CARD32	delay;
     BOOL	servnumlock;
     BOOL	pad2;
-    CARD16	pad3 B16;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xXF86MiscGetKbdSettingsReply;
 #define sz_xXF86MiscGetKbdSettingsReply	32
 
 typedef struct _XF86MiscSetMouseSettings {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscSetMouseSettings */
-    CARD16	length B16;
-    CARD32	mousetype B32;
-    CARD32	baudrate B32;
-    CARD32	samplerate B32;
-    CARD32	resolution B32;
-    CARD32	buttons B32;
+    CARD16	length;
+    CARD32	mousetype;
+    CARD32	baudrate;
+    CARD32	samplerate;
+    CARD32	resolution;
+    CARD32	buttons;
     BOOL	emulate3buttons;
     BOOL	chordmiddle;
-    CARD16	devnamelen B16;
-    CARD32	emulate3timeout B32;
-    CARD32	flags B32;
+    CARD16	devnamelen;
+    CARD32	emulate3timeout;
+    CARD32	flags;
 } xXF86MiscSetMouseSettingsReq;
 #define sz_xXF86MiscSetMouseSettingsReq	36
 
 typedef struct _XF86MiscSetKbdSettings {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscSetKbdSettings */
-    CARD16	length B16;
-    CARD32	kbdtype B32;
-    CARD32	rate B32;
-    CARD32	delay B32;
+    CARD16	length;
+    CARD32	kbdtype;
+    CARD32	rate;
+    CARD32	delay;
     BOOL	servnumlock;
     BOOL	pad1;
-    CARD16	pad2 B16;
+    CARD16	pad2;
 } xXF86MiscSetKbdSettingsReq;
 #define sz_xXF86MiscSetKbdSettingsReq	20
 
 typedef struct _XF86MiscSetGrabKeysState {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscSetKbdSettings */
-    CARD16	length B16;
+    CARD16	length;
     BOOL	enable;
     BOOL	pad1;
-    CARD16	pad2 B16;
+    CARD16	pad2;
 } xXF86MiscSetGrabKeysStateReq;
 #define sz_xXF86MiscSetGrabKeysStateReq	8
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	status B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	status;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86MiscSetGrabKeysStateReply;
 #define sz_xXF86MiscSetGrabKeysStateReply	32
 
 typedef struct _XF86MiscSetClientVersion {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
+    CARD16	length;
+    CARD16	major;
+    CARD16	minor;
 } xXF86MiscSetClientVersionReq;
 #define sz_xXF86MiscSetClientVersionReq	8
 
 typedef struct _XF86MiscGetFilePaths {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscGetFilePaths */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86MiscGetFilePathsReq;
 #define sz_xXF86MiscGetFilePathsReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	configlen B16;
-    CARD16	modulelen B16;
-    CARD16	loglen B16;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	configlen;
+    CARD16	modulelen;
+    CARD16	loglen;
+    CARD16	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86MiscGetFilePathsReply;
 #define sz_xXF86MiscGetFilePathsReply	32
 
 typedef struct _XF86MiscPassMessage {
     CARD8	reqType;		/* always XF86MiscReqCode */
     CARD8	xf86miscReqType;	/* always X_XF86MiscPassMessage */
-    CARD16	length B16;
-    CARD16	typelen B16;
-    CARD16	vallen B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16	length;
+    CARD16	typelen;
+    CARD16	vallen;
+    CARD16	screen;
+    CARD16	pad;
 } xXF86MiscPassMessageReq;
 #define sz_xXF86MiscPassMessageReq	12
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BYTE	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	mesglen B16;
-    CARD16	pad2 B16;
-    CARD32	status B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	mesglen;
+    CARD16	pad2;
+    CARD32	status;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86MiscPassMessageReply;
 #define sz_xXF86MiscPassMessageReply	32