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

diff --git a/include/X11/extensions/xf86dgaproto.h b/include/X11/extensions/xf86dgaproto.h
index 8d2fb64..2e8a712 100644
--- a/include/X11/extensions/xf86dgaproto.h
+++ b/include/X11/extensions/xf86dgaproto.h
@@ -20,44 +20,44 @@ Copyright (c) 1995  XFree86 Inc.
 typedef struct _XDGAQueryVersion {
     CARD8	reqType;		/* always DGAReqCode */
     CARD8	dgaReqType;		/* always X_DGAQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xXDGAQueryVersionReq;
 #define sz_xXDGAQueryVersionReq		4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DGA protocol */
-    CARD16	minorVersion B16;	/* minor version of DGA 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 DGA protocol */
+    CARD16	minorVersion;		/* minor version of DGA protocol */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXDGAQueryVersionReply;
 #define sz_xXDGAQueryVersionReply	32
 
 typedef struct _XDGAQueryModes {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXDGAQueryModesReq;
 #define sz_xXDGAQueryModesReq		8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	number B32;		/* number of modes available */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	number;			/* number of modes available */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXDGAQueryModesReply;
 #define sz_xXDGAQueryModesReply	32
 
@@ -65,77 +65,77 @@ typedef struct {
 typedef struct _XDGASetMode {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mode B32;		/* mode number to init */
-    CARD32	pid B32;		/* Pixmap descriptor */
+    CARD16	length;
+    CARD32	screen;
+    CARD32	mode;			/* mode number to init */
+    CARD32	pid;			/* Pixmap descriptor */
 } xXDGASetModeReq;
 #define sz_xXDGASetModeReq		16
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	offset B32;		/* offset into framebuffer map */
-    CARD32	flags B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	offset;			/* offset into framebuffer map */
+    CARD32	flags;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xXDGASetModeReply;
 #define sz_xXDGASetModeReply	32
 
 typedef struct {
    CARD8	byte_order;
    CARD8	depth;
-   CARD16 	num B16;
-   CARD16	bpp B16;
-   CARD16	name_size B16;
-   CARD32	vsync_num B32;
-   CARD32	vsync_den B32;
-   CARD32	flags B32;
-   CARD16	image_width B16;
-   CARD16	image_height B16;
-   CARD16	pixmap_width B16;
-   CARD16	pixmap_height B16;
-   CARD32	bytes_per_scanline B32;
-   CARD32	red_mask B32;
-   CARD32	green_mask B32;
-   CARD32	blue_mask B32;
-   CARD16	visual_class B16;
-   CARD16	pad1 B16;
-   CARD16	viewport_width B16;
-   CARD16	viewport_height B16;
-   CARD16	viewport_xstep B16;
-   CARD16	viewport_ystep B16;
-   CARD16	viewport_xmax B16;
-   CARD16	viewport_ymax B16;
-   CARD32	viewport_flags B32;
-   CARD32	reserved1 B32;
-   CARD32	reserved2 B32;
+   CARD16 	num;
+   CARD16	bpp;
+   CARD16	name_size;
+   CARD32	vsync_num;
+   CARD32	vsync_den;
+   CARD32	flags;
+   CARD16	image_width;
+   CARD16	image_height;
+   CARD16	pixmap_width;
+   CARD16	pixmap_height;
+   CARD32	bytes_per_scanline;
+   CARD32	red_mask;
+   CARD32	green_mask;
+   CARD32	blue_mask;
+   CARD16	visual_class;
+   CARD16	pad1;
+   CARD16	viewport_width;
+   CARD16	viewport_height;
+   CARD16	viewport_xstep;
+   CARD16	viewport_ystep;
+   CARD16	viewport_xmax;
+   CARD16	viewport_ymax;
+   CARD32	viewport_flags;
+   CARD32	reserved1;
+   CARD32	reserved2;
 } xXDGAModeInfo;
 #define sz_xXDGAModeInfo 72
 
 typedef struct _XDGAOpenFramebuffer {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXDGAOpenFramebufferReq;
 #define sz_xXDGAOpenFramebufferReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;		/* device name size if there is one */
-    CARD32	mem1 B32;		/* physical memory */
-    CARD32	mem2 B32;		/* spillover for _alpha_ */
-    CARD32	size B32;		/* size of map in bytes */
-    CARD32	offset B32;		/* optional offset into device */
-    CARD32	extra B32;		/* extra info associated with the map */
-    CARD32	pad2 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;			/* device name size if there is one */
+    CARD32	mem1;			/* physical memory */
+    CARD32	mem2;			/* spillover for _alpha_ */
+    CARD32	size;			/* size of map in bytes */
+    CARD32	offset;			/* optional offset into device */
+    CARD32	extra;			/* extra info associated with the map */
+    CARD32	pad2;
 } xXDGAOpenFramebufferReply;
 #define sz_xXDGAOpenFramebufferReply	32
 
@@ -143,8 +143,8 @@ typedef struct {
 typedef struct _XDGACloseFramebuffer {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXDGACloseFramebufferReq;
 #define sz_xXDGACloseFramebufferReq	8
 
@@ -152,11 +152,11 @@ typedef struct _XDGACloseFramebuffer {
 typedef struct _XDGASetViewport {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD16	x;
+    CARD16	y;
+    CARD32	flags;
 } xXDGASetViewportReq;
 #define sz_xXDGASetViewportReq	16
 
@@ -164,31 +164,31 @@ typedef struct _XDGASetViewport {
 typedef struct _XDGAInstallColormap {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	cmap B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	cmap;
 } xXDGAInstallColormapReq;
 #define sz_xXDGAInstallColormapReq	12
 
 typedef struct _XDGASelectInput {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	mask B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	mask;
 } xXDGASelectInputReq;
 #define sz_xXDGASelectInputReq	12
 
 typedef struct _XDGAFillRectangle {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD32	color B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD16	x;
+    CARD16	y;
+    CARD16	width;
+    CARD16	height;
+    CARD32	color;
 } xXDGAFillRectangleReq;
 #define sz_xXDGAFillRectangleReq	20
 
@@ -196,29 +196,29 @@ typedef struct _XDGAFillRectangle {
 typedef struct _XDGACopyArea {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
+    CARD16	length;
+    CARD32	screen;
+    CARD16	srcx;
+    CARD16	srcy;
+    CARD16	width;
+    CARD16	height;
+    CARD16	dstx;
+    CARD16	dsty;
 } xXDGACopyAreaReq;
 #define sz_xXDGACopyAreaReq	20
 
 typedef struct _XDGACopyTransparentArea {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	srcx B16;
-    CARD16	srcy B16;
-    CARD16	width B16;
-    CARD16	height B16;
-    CARD16	dstx B16;
-    CARD16	dsty B16;
-    CARD32	key B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD16	srcx;
+    CARD16	srcy;
+    CARD16	width;
+    CARD16	height;
+    CARD16	dstx;
+    CARD16	dsty;
+    CARD32	key;
 } xXDGACopyTransparentAreaReq;
 #define sz_xXDGACopyTransparentAreaReq	24
 
@@ -226,53 +226,53 @@ typedef struct _XDGACopyTransparentArea {
 typedef struct _XDGAGetViewportStatus {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXDGAGetViewportStatusReq;
 #define sz_xXDGAGetViewportStatusReq	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;
 } xXDGAGetViewportStatusReply;
 #define sz_xXDGAGetViewportStatusReply	32
 
 typedef struct _XDGASync {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xXDGASyncReq;
 #define sz_xXDGASyncReq	8
 
 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;
 } xXDGASyncReply;
 #define sz_xXDGASyncReply	32
 
 typedef struct _XDGASetClientVersion {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
+    CARD16	length;
+    CARD16	major;
+    CARD16	minor;
 } xXDGASetClientVersionReq;
 #define sz_xXDGASetClientVersionReq	8
 
@@ -280,36 +280,36 @@ typedef struct _XDGASetClientVersion {
 typedef struct {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	flags B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD16	x;
+    CARD16	y;
+    CARD32	flags;
 } xXDGAChangePixmapModeReq;
 #define sz_xXDGAChangePixmapModeReq	16
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	x B16;
-    CARD16	y B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	x;
+    CARD16	y;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
+    CARD32	pad7;
 } xXDGAChangePixmapModeReply;
 #define sz_xXDGAChangePixmapModeReply	32
 
 typedef struct _XDGACreateColormap {
     CARD8	reqType;
     CARD8	dgaReqType;
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	id B32;
-    CARD32	mode B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	id;
+    CARD32	mode;
     CARD8	alloc;
     CARD8	pad1;
     CARD16	pad2;
@@ -322,19 +322,19 @@ typedef struct {
     struct {
       BYTE type;
       BYTE detail;
-      CARD16 sequenceNumber B16;
+      CARD16 sequenceNumber;
     } u;
     struct {
-      CARD32 pad0 B32;
-      CARD32 time B32;
-      INT16 dx B16;
-      INT16 dy B16;
-      INT16 screen B16;
-      CARD16 state B16;
-      CARD32 pad1 B32;
-      CARD32 pad2 B32;
-      CARD32 pad3 B32;
-      CARD32 pad4 B32;
+      CARD32 pad0;
+      CARD32 time;
+      INT16 dx;
+      INT16 dy;
+      INT16 screen;
+      CARD16 state;
+      CARD32 pad1;
+      CARD32 pad2;
+      CARD32 pad3;
+      CARD32 pad4;
     } event;
   } u;
 } dgaEvent;