From 641db34376d18ed5b76ff8883284bef4898d71be Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 16 Jun 2018 14:34:14 -0700
Subject: 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>
---
 include/X11/extensions/dpmsproto.h | 102 ++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

(limited to 'include/X11/extensions/dpmsproto.h')

diff --git a/include/X11/extensions/dpmsproto.h b/include/X11/extensions/dpmsproto.h
index 63fd3fc..c847016 100644
--- a/include/X11/extensions/dpmsproto.h
+++ b/include/X11/extensions/dpmsproto.h
@@ -48,127 +48,127 @@ Equipment Corporation.
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSGetVersion */
-    CARD16	length B16;
-    CARD16	majorVersion B16;
-    CARD16	minorVersion B16;
+    CARD16	length;
+    CARD16	majorVersion;
+    CARD16	minorVersion;
 } xDPMSGetVersionReq;
 #define sz_xDPMSGetVersionReq 8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;
-    CARD16	minorVersion B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;
+    CARD16	minorVersion;
+    CARD32	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xDPMSGetVersionReply;
 #define sz_xDPMSGetVersionReply 32
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSCapable */
-    CARD16	length B16;
+    CARD16	length;
 } xDPMSCapableReq;
 #define sz_xDPMSCapableReq 4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
     BOOL	capable;
     CARD8	pad1;
-    CARD16	pad2 B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
+    CARD16	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
+    CARD32	pad7;
 } xDPMSCapableReply;
 #define sz_xDPMSCapableReply 32
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSGetTimeouts */
-    CARD16	length B16;
+    CARD16	length;
 } xDPMSGetTimeoutsReq;
 #define sz_xDPMSGetTimeoutsReq 4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	standby B16;
-    CARD16	suspend B16;
-    CARD16	off B16;
-    CARD16	pad1 B16;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	standby;
+    CARD16	suspend;
+    CARD16	off;
+    CARD16	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xDPMSGetTimeoutsReply;
 #define sz_xDPMSGetTimeoutsReply 32
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSSetTimeouts */
-    CARD16	length B16;
-    CARD16	standby B16;
-    CARD16	suspend B16;
-    CARD16	off B16;
-    CARD16	pad0 B16;
+    CARD16	length;
+    CARD16	standby;
+    CARD16	suspend;
+    CARD16	off;
+    CARD16	pad0;
 } xDPMSSetTimeoutsReq;
 #define sz_xDPMSSetTimeoutsReq 12
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSEnable */
-    CARD16	length B16;
+    CARD16	length;
 } xDPMSEnableReq;
 #define sz_xDPMSEnableReq 4
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSDisable */
-    CARD16	length B16;
+    CARD16	length;
 } xDPMSDisableReq;
 #define sz_xDPMSDisableReq 4
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSForceLevel */
-    CARD16	length B16;
-    CARD16	level B16;	/* power level requested */
-    CARD16	pad0 B16;
+    CARD16	length;
+    CARD16	level;		/* power level requested */
+    CARD16	pad0;
 } xDPMSForceLevelReq;
 #define sz_xDPMSForceLevelReq 8
 
 typedef struct {
     CARD8	reqType;	/* always DPMSCode */
     CARD8	dpmsReqType;	/* always X_DPMSInfo */
-    CARD16	length B16;
+    CARD16	length;
 } xDPMSInfoReq;
 #define sz_xDPMSInfoReq 4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	power_level B16;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	power_level;
     BOOL	state;
     CARD8	pad1;
-    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;
 } xDPMSInfoReply;
 #define sz_xDPMSInfoReply 32
 
-- 
cgit v1.2.3