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

diff --git a/include/X11/extensions/xf86vmproto.h b/include/X11/extensions/xf86vmproto.h
index 4c7966f..7307284 100644
--- a/include/X11/extensions/xf86vmproto.h
+++ b/include/X11/extensions/xf86vmproto.h
@@ -72,31 +72,31 @@ from Kaleb S. KEITHLEY
 typedef struct _XF86VidModeQueryVersion {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xXF86VidModeQueryVersionReq;
 #define sz_xXF86VidModeQueryVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of XF86VidMode */
-    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;		/* major version of XF86VidMode */
+    CARD16	minorVersion;		/* minor version of XF86VidMode */
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86VidModeQueryVersionReply;
 #define sz_xXF86VidModeQueryVersionReply	32
 
 typedef struct _XF86VidModeGetModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
 } xXF86VidModeGetModeLineReq,
   xXF86VidModeGetAllModeLinesReq,
   xXF86VidModeGetMonitorReq,
@@ -113,24 +113,24 @@ typedef struct _XF86VidModeGetModeLine {
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	hskew;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD16	pad2;
+    CARD32	flags;
+    CARD32	reserved1;
+    CARD32	reserved2;
+    CARD32	reserved3;
+    CARD32	privsize;
 } xXF86VidModeGetModeLineReply;
 #define sz_xXF86VidModeGetModeLineReply	52
 
@@ -138,106 +138,106 @@ typedef struct {
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD32	flags;
+    CARD32	privsize;
 } xXF86OldVidModeGetModeLineReply;
 #define sz_xXF86OldVidModeGetModeLineReply	36
 
 typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD32	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD32	hskew;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD16	pad1;
+    CARD32	flags;
+    CARD32	reserved1;
+    CARD32	reserved2;
+    CARD32	reserved3;
+    CARD32	privsize;
 } xXF86VidModeModeInfo;
 
 /* 0.x version */
 typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD32	flags;
+    CARD32	privsize;
 } xXF86OldVidModeModeInfo;
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	modecount B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	modecount;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86VidModeGetAllModeLinesReply;
 #define sz_xXF86VidModeGetAllModeLinesReply	32
 
 typedef struct _XF86VidModeAddModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_hskew B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	after_flags B32;
-    CARD32	reserved4 B32;
-    CARD32	reserved5 B32;
-    CARD32	reserved6 B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	hskew;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD16	pad1;
+    CARD32	flags;
+    CARD32	reserved1;
+    CARD32	reserved2;
+    CARD32	reserved3;
+    CARD32	privsize;
+    CARD32	after_dotclock;
+    CARD16	after_hdisplay;
+    CARD16	after_hsyncstart;
+    CARD16	after_hsyncend;
+    CARD16	after_htotal;
+    CARD16	after_hskew;
+    CARD16	after_vdisplay;
+    CARD16	after_vsyncstart;
+    CARD16	after_vsyncend;
+    CARD16	after_vtotal;
+    CARD16	pad2;
+    CARD32	after_flags;
+    CARD32	reserved4;
+    CARD32	reserved5;
+    CARD32	reserved6;
 } xXF86VidModeAddModeLineReq;
 #define sz_xXF86VidModeAddModeLineReq	92
 
@@ -245,52 +245,52 @@ typedef struct _XF86VidModeAddModeLine {
 typedef struct _XF86OldVidModeAddModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD32	after_flags B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD32	flags;
+    CARD32	privsize;
+    CARD32	after_dotclock;
+    CARD16	after_hdisplay;
+    CARD16	after_hsyncstart;
+    CARD16	after_hsyncend;
+    CARD16	after_htotal;
+    CARD16	after_vdisplay;
+    CARD16	after_vsyncstart;
+    CARD16	after_vsyncend;
+    CARD16	after_vtotal;
+    CARD32	after_flags;
 } xXF86OldVidModeAddModeLineReq;
 #define sz_xXF86OldVidModeAddModeLineReq	60
 
 typedef struct _XF86VidModeModModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	hskew;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD16	pad1;
+    CARD32	flags;
+    CARD32	reserved1;
+    CARD32	reserved2;
+    CARD32	reserved3;
+    CARD32	privsize;
 } xXF86VidModeModModeLineReq;
 #define sz_xXF86VidModeModModeLineReq	48
 
@@ -298,42 +298,42 @@ typedef struct _XF86VidModeModModeLine {
 typedef struct _XF86OldVidModeModModeLine {
     CARD8	reqType;		/* always XF86OldVidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD32	flags;
+    CARD32	privsize;
 } xXF86OldVidModeModModeLineReq;
 #define sz_xXF86OldVidModeModModeLineReq	32
 
 typedef struct _XF86VidModeValidateModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	hskew;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD16	pad1;
+    CARD32	flags;
+    CARD32	reserved1;
+    CARD32	reserved2;
+    CARD32	reserved3;
+    CARD32	privsize;
 } xXF86VidModeDeleteModeLineReq,
   xXF86VidModeValidateModeLineReq,
   xXF86VidModeSwitchToModeReq;
@@ -345,19 +345,19 @@ typedef struct _XF86VidModeValidateModeLine {
 typedef struct _XF86OldVidModeValidateModeLine {
     CARD8	reqType;		/* always XF86OldVidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
+    CARD16	length;
+    CARD32	screen;			/* could be CARD16 but need the pad */
+    CARD32	dotclock;
+    CARD16	hdisplay;
+    CARD16	hsyncstart;
+    CARD16	hsyncend;
+    CARD16	htotal;
+    CARD16	vdisplay;
+    CARD16	vsyncstart;
+    CARD16	vsyncend;
+    CARD16	vtotal;
+    CARD32	flags;
+    CARD32	privsize;
 } xXF86OldVidModeDeleteModeLineReq,
   xXF86OldVidModeValidateModeLineReq,
   xXF86OldVidModeSwitchToModeReq;
@@ -368,141 +368,141 @@ typedef struct _XF86OldVidModeValidateModeLine {
 typedef struct _XF86VidModeSwitchMode {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	zoom B16;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	zoom;
 } xXF86VidModeSwitchModeReq;
 #define sz_xXF86VidModeSwitchModeReq	8
 
 typedef struct _XF86VidModeLockModeSwitch {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	lock B16;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	lock;
 } xXF86VidModeLockModeSwitchReq;
 #define sz_xXF86VidModeLockModeSwitchReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     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;
 } xXF86VidModeValidateModeLineReply;
 #define sz_xXF86VidModeValidateModeLineReply	32
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
     CARD8	vendorLength;
     CARD8	modelLength;
     CARD8	nhsync;
     CARD8	nvsync;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86VidModeGetMonitorReply;
 #define sz_xXF86VidModeGetMonitorReply	32
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	x B32;
-    CARD32	y B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	x;
+    CARD32	y;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xXF86VidModeGetViewPortReply;
 #define sz_xXF86VidModeGetViewPortReply	32
 
 typedef struct _XF86VidModeSetViewPort {
     CARD8	reqType;		/* always VidModeReqCode */
     CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32      x B32;
-    CARD32	y B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	x;
+    CARD32	y;
 } xXF86VidModeSetViewPortReq;
 #define sz_xXF86VidModeSetViewPortReq	16
 
 typedef struct {
     BYTE	type;
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	flags B32;
-    CARD32	clocks B32;
-    CARD32	maxclocks B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	flags;
+    CARD32	clocks;
+    CARD32	maxclocks;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
 } xXF86VidModeGetDotClocksReply;
 #define sz_xXF86VidModeGetDotClocksReply	32
 
 typedef struct _XF86VidModeSetClientVersion {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
+    CARD16	length;
+    CARD16	major;
+    CARD16	minor;
 } xXF86VidModeSetClientVersionReq;
 #define sz_xXF86VidModeSetClientVersionReq	8
 
 typedef struct _XF86VidModeGetGamma {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xXF86VidModeGetGammaReq;
 #define sz_xXF86VidModeGetGammaReq		32
 
 typedef struct {
     BYTE	type;
     BOOL	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD32	red;
+    CARD32	green;
+    CARD32	blue;
+    CARD32	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
 } xXF86VidModeGetGammaReply;
 #define sz_xXF86VidModeGetGammaReply		32
 
 typedef struct _XF86VidModeSetGamma {
     CARD8	reqType;		/* always XF86VidModeReqCode */
     CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
+    CARD16	length;
+    CARD16	screen;
+    CARD16	pad;
+    CARD32	red;
+    CARD32	green;
+    CARD32	blue;
+    CARD32	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
 } xXF86VidModeSetGammaReq;
 #define sz_xXF86VidModeSetGammaReq		32
 
@@ -510,71 +510,71 @@ typedef struct _XF86VidModeSetGamma {
 typedef struct _XF86VidModeSetGammaRamp {
     CARD8       reqType;                /* always XF86VidModeReqCode */
     CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      size;
 } xXF86VidModeSetGammaRampReq;
 #define sz_xXF86VidModeSetGammaRampReq             8
 
 typedef struct _XF86VidModeGetGammaRamp {
     CARD8       reqType;                /* always XF86VidModeReqCode */
     CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      size;
 } xXF86VidModeGetGammaRampReq;
 #define sz_xXF86VidModeGetGammaRampReq             8
 
 typedef struct {
     BYTE        type;
     BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
+    CARD16      sequenceNumber;
+    CARD32      length;
+    CARD16      size;
+    CARD16      pad0;
+    CARD32      pad1;
+    CARD32      pad2;
+    CARD32      pad3;
+    CARD32      pad4;
+    CARD32      pad5;
 } xXF86VidModeGetGammaRampReply;
 #define sz_xXF86VidModeGetGammaRampReply            32
 
 typedef struct _XF86VidModeGetGammaRampSize {
     CARD8       reqType;                /* always XF86VidModeReqCode */
     CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
+    CARD16      length;
+    CARD16      screen;
+    CARD16      pad;
 } xXF86VidModeGetGammaRampSizeReq;
 #define sz_xXF86VidModeGetGammaRampSizeReq             8
 
 typedef struct {
     BYTE        type;
     BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
+    CARD16      sequenceNumber;
+    CARD32      length;
+    CARD16      size;
+    CARD16      pad0;
+    CARD32      pad1;
+    CARD32      pad2;
+    CARD32      pad3;
+    CARD32      pad4;
+    CARD32      pad5;
 } xXF86VidModeGetGammaRampSizeReply;
 #define sz_xXF86VidModeGetGammaRampSizeReply            32
 
 typedef struct {
     BYTE        type;
     BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      permissions B32;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
+    CARD16      sequenceNumber;
+    CARD32      length;
+    CARD32      permissions;
+    CARD32      pad1;
+    CARD32      pad2;
+    CARD32      pad3;
+    CARD32      pad4;
+    CARD32      pad5;
 } xXF86VidModeGetPermissionsReply;
 #define sz_xXF86VidModeGetPermissionsReply            32