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

diff --git a/include/X11/dri/xf86driproto.h b/include/X11/dri/xf86driproto.h
index 4b71469..509b115 100644
--- a/include/X11/dri/xf86driproto.h
+++ b/include/X11/dri/xf86driproto.h
@@ -57,214 +57,214 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 typedef struct _XF86DRIQueryVersion {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86DRIQueryVersionReq;
 #define sz_xXF86DRIQueryVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DRI protocol */
-    CARD16	minorVersion B16;	/* minor version of DRI protocol */
-    CARD32	patchVersion B32;       /* patch version of DRI protocol */
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;		/* major version of DRI protocol */
+    CARD16	minorVersion;		/* minor version of DRI protocol */
+    CARD32	patchVersion;		/* patch version of DRI protocol */
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86DRIQueryVersionReply;
 #define sz_xXF86DRIQueryVersionReply	32
 
 typedef struct _XF86DRIQueryDirectRenderingCapable {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* X_DRIQueryDirectRenderingCapable */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXF86DRIQueryDirectRenderingCapableReq;
 #define sz_xXF86DRIQueryDirectRenderingCapableReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
     BOOL	isCapable;
     BOOL	pad2;
     BOOL	pad3;
     BOOL	pad4;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-    CARD32	pad8 B32;
-    CARD32	pad9 B32;
+    CARD32	pad5;
+    CARD32	pad6;
+    CARD32	pad7;
+    CARD32	pad8;
+    CARD32	pad9;
 } xXF86DRIQueryDirectRenderingCapableReply;
 #define sz_xXF86DRIQueryDirectRenderingCapableReply	32
 
 typedef struct _XF86DRIOpenConnection {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIOpenConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXF86DRIOpenConnectionReq;
 #define sz_xXF86DRIOpenConnectionReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hSAREALow B32;
-    CARD32	hSAREAHigh B32;
-    CARD32	busIdStringLength B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-    CARD32	pad8 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	hSAREALow;
+    CARD32	hSAREAHigh;
+    CARD32	busIdStringLength;
+    CARD32	pad6;
+    CARD32	pad7;
+    CARD32	pad8;
 } xXF86DRIOpenConnectionReply;
 #define sz_xXF86DRIOpenConnectionReply	32
 
 typedef struct _XF86DRIAuthConnection {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRICloseConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32      magic B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	magic;
 } xXF86DRIAuthConnectionReq;
 #define sz_xXF86DRIAuthConnectionReq	12
 
 typedef struct {
     BYTE        type;
     BOOL        pad1;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      authenticated B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
+    CARD16      sequenceNumber;
+    CARD32      length;
+    CARD32      authenticated;
+    CARD32      pad2;
+    CARD32      pad3;
+    CARD32      pad4;
+    CARD32      pad5;
+    CARD32      pad6;
 } xXF86DRIAuthConnectionReply;
 #define zx_xXF86DRIAuthConnectionReply  32
 
 typedef struct _XF86DRICloseConnection {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRICloseConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXF86DRICloseConnectionReq;
 #define sz_xXF86DRICloseConnectionReq	8
 
 typedef struct _XF86DRIGetClientDriverName {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIGetClientDriverName */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXF86DRIGetClientDriverNameReq;
 #define sz_xXF86DRIGetClientDriverNameReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	ddxDriverMajorVersion B32;
-    CARD32	ddxDriverMinorVersion B32;
-    CARD32	ddxDriverPatchVersion B32;
-    CARD32	clientDriverNameLength B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	ddxDriverMajorVersion;
+    CARD32	ddxDriverMinorVersion;
+    CARD32	ddxDriverPatchVersion;
+    CARD32	clientDriverNameLength;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86DRIGetClientDriverNameReply;
 #define sz_xXF86DRIGetClientDriverNameReply	32
 
 typedef struct _XF86DRICreateContext {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRICreateContext */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	visual B32;
-    CARD32	context B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	visual;
+    CARD32	context;
 } xXF86DRICreateContextReq;
 #define sz_xXF86DRICreateContextReq	16
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hHWContext B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	hHWContext;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86DRICreateContextReply;
 #define sz_xXF86DRICreateContextReply	32
 
 typedef struct _XF86DRIDestroyContext {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIDestroyContext */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	context B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	context;
 } xXF86DRIDestroyContextReq;
 #define sz_xXF86DRIDestroyContextReq	12
 
 typedef struct _XF86DRICreateDrawable {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRICreateDrawable */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	drawable;
 } xXF86DRICreateDrawableReq;
 #define sz_xXF86DRICreateDrawableReq	12
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hHWDrawable B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	hHWDrawable;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86DRICreateDrawableReply;
 #define sz_xXF86DRICreateDrawableReply	32
 
 typedef struct _XF86DRIDestroyDrawable {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIDestroyDrawable */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	drawable;
 } xXF86DRIDestroyDrawableReq;
 #define sz_xXF86DRIDestroyDrawableReq	12
 
 typedef struct _XF86DRIGetDrawableInfo {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIGetDrawableInfo */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	drawable;
 } xXF86DRIGetDrawableInfoReq;
 #define sz_xXF86DRIGetDrawableInfoReq	12
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	drawableTableIndex B32;
-    CARD32	drawableTableStamp B32;
-    INT16	drawableX B16;
-    INT16	drawableY B16;
-    INT16	drawableWidth B16;
-    INT16	drawableHeight B16;
-    CARD32	numClipRects B32;
-    INT16       backX B16;
-    INT16       backY B16;
-    CARD32      numBackClipRects B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	drawableTableIndex;
+    CARD32	drawableTableStamp;
+    INT16	drawableX;
+    INT16	drawableY;
+    INT16	drawableWidth;
+    INT16	drawableHeight;
+    CARD32	numClipRects;
+    INT16	backX;
+    INT16	backY;
+    CARD32	numBackClipRects;
 } xXF86DRIGetDrawableInfoReply;
 
 #define sz_xXF86DRIGetDrawableInfoReply	36
@@ -273,68 +273,68 @@ typedef struct {
 typedef struct _XF86DRIGetDeviceInfo {
     CARD8	reqType;		/* always DRIReqCode */
     CARD8	driReqType;		/* always X_DRIGetDeviceInfo */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXF86DRIGetDeviceInfoReq;
 #define sz_xXF86DRIGetDeviceInfoReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hFrameBufferLow B32;
-    CARD32	hFrameBufferHigh B32;
-    CARD32	framebufferOrigin B32;
-    CARD32	framebufferSize B32;
-    CARD32	framebufferStride B32;
-    CARD32	devPrivateSize B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	hFrameBufferLow;
+    CARD32	hFrameBufferHigh;
+    CARD32	framebufferOrigin;
+    CARD32	framebufferSize;
+    CARD32	framebufferStride;
+    CARD32	devPrivateSize;
 } xXF86DRIGetDeviceInfoReply;
 #define sz_xXF86DRIGetDeviceInfoReply	32
 
 typedef struct _XF86DRIOpenFullScreen {
     CARD8       reqType;	/* always DRIReqCode */
     CARD8       driReqType;	/* always X_DRIOpenFullScreen */
-    CARD16      length B16;
-    CARD32      screen B32;
-    CARD32      drawable B32;
+    CARD16      length;
+    CARD32      screen;
+    CARD32      drawable;
 } xXF86DRIOpenFullScreenReq;
 #define sz_xXF86DRIOpenFullScreenReq    12
 
 typedef struct {
     BYTE        type;
     BOOL        pad1;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      isFullScreen B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
+    CARD16      sequenceNumber;
+    CARD32      length;
+    CARD32      isFullScreen;
+    CARD32      pad2;
+    CARD32      pad3;
+    CARD32      pad4;
+    CARD32      pad5;
+    CARD32      pad6;
 } xXF86DRIOpenFullScreenReply;
 #define sz_xXF86DRIOpenFullScreenReply  32
 
 typedef struct _XF86DRICloseFullScreen {
     CARD8       reqType;	/* always DRIReqCode */
     CARD8       driReqType;	/* always X_DRICloseFullScreen */
-    CARD16      length B16;
-    CARD32      screen B32;
-    CARD32      drawable B32;
+    CARD16      length;
+    CARD32      screen;
+    CARD32      drawable;
 } xXF86DRICloseFullScreenReq;
 #define sz_xXF86DRICloseFullScreenReq   12
 
 typedef struct {
     BYTE        type;
     BOOL        pad1;
-    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;
 } xXF86DRICloseFullScreenReply;
 #define sz_xXF86DRICloseFullScreenReply  32