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

diff --git a/include/X11/extensions/xf86rushstr.h b/include/X11/extensions/xf86rushstr.h
index 8dca46a..7c31a8a 100644
--- a/include/X11/extensions/xf86rushstr.h
+++ b/include/X11/extensions/xf86rushstr.h
@@ -18,73 +18,73 @@ Copyright (c) 1998  Daryll Strauss
 typedef struct _XF86RushQueryVersion {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86RushQueryVersionReq;
 #define sz_xXF86RushQueryVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of Rush protocol */
-    CARD16	minorVersion B16;	/* minor version of Rush protocol */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;		/* major version of Rush protocol */
+    CARD16	minorVersion;		/* minor version of Rush protocol */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86RushQueryVersionReply;
 #define sz_xXF86RushQueryVersionReply	32
 
 typedef struct _XF86RushLockPixmap {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushLockPixmap */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	pixmap B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	pixmap;
 } xXF86RushLockPixmapReq;
 #define sz_xXF86RushLockPixmapReq	12
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	addr B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	addr;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86RushLockPixmapReply;
 #define sz_xXF86RushLockPixmapReply	32
 
 typedef struct _XF86RushUnlockPixmap {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushUnlockPixmap */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	pixmap B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	pixmap;
 } xXF86RushUnlockPixmapReq;
 #define sz_xXF86RushUnlockPixmapReq	12
 
 typedef struct _XF86RushUnlockAllPixmaps {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushUnlockAllPixmaps */
-    CARD16      length B16;
+    CARD16      length;
 } xXF86RushUnlockAllPixmapsReq;
 #define sz_xXF86RushUnlockAllPixmapsReq   4
 
 typedef struct _XF86RushSetCopyMode {
     CARD8       reqType;                /* always RushReqCode */
     CARD8       rushReqType;            /* always X_RushSetCopyMode */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
-    CARD32      CopyMode B32;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
+    CARD32      CopyMode;
 } xXF86RushSetCopyModeReq;
 #define sz_xXF86RushSetCopyModeReq      12
 
@@ -92,71 +92,71 @@ typedef struct _XF86RushSetCopyMode {
 typedef struct _XF86RushSetPixelStride {
     CARD8       reqType;                /* always RushReqCode */
     CARD8       rushReqType;            /* always X_RushSetCopyMode */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
-    CARD32      PixelStride B32;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
+    CARD32      PixelStride;
 } xXF86RushSetPixelStrideReq;
 #define sz_xXF86RushSetPixelStrideReq      12
 
 typedef struct {
     CARD8	reqType;               /* always RushReqCode */
     CARD8	rushReqType;           /* always X_RushOverlayPixmap */
-    CARD16	length B16;
-    XvPortID	port B32;
-    Drawable	drawable B32;
-    GContext	gc B32;
-    Pixmap	pixmap B32;
-    CARD32	id B32;
-    INT16	src_x B16;
-    INT16	src_y B16;
-    CARD16	src_w B16;
-    CARD16	src_h B16;
-    INT16	drw_x B16;
-    INT16	drw_y B16;
-    CARD16	drw_w B16;
-    CARD16	drw_h B16;
+    CARD16	length;
+    XvPortID	port;
+    Drawable	drawable;
+    GContext	gc;
+    Pixmap	pixmap;
+    CARD32	id;
+    INT16	src_x;
+    INT16	src_y;
+    CARD16	src_w;
+    CARD16	src_h;
+    INT16	drw_x;
+    INT16	drw_y;
+    CARD16	drw_w;
+    CARD16	drw_h;
 } xXF86RushOverlayPixmapReq;
 #define sz_xXF86RushOverlayPixmapReq 40
 
 typedef struct _XF86RushStatusRegOffset {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushStatusRegOffset */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
 } xXF86RushStatusRegOffsetReq;
 #define sz_xXF86RushStatusRegOffsetReq   8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;		/* Offset of Rush status reg in mem */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	offset;			/* Offset of Rush status reg in mem */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86RushStatusRegOffsetReply;
 #define sz_xXF86RushStatusRegOffsetReply	32
 
 typedef struct _XF86RushAT3DEnableRegs {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushAT3DEnableRegs */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
 } xXF86RushAT3DEnableRegsReq;
 #define sz_xXF86RushAT3DEnableRegsReq   8
 
 typedef struct _XF86RushAT3DDisableRegs {
     CARD8	reqType;		/* always RushReqCode */
     CARD8	rushReqType;		/* always X_RushAT3DDisableRegs */
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
 } xXF86RushAT3DDisableRegsReq;
 #define sz_xXF86RushAT3DDisableRegsReq   8