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

diff --git a/include/X11/extensions/xcalibrateproto.h b/include/X11/extensions/xcalibrateproto.h
index 2301754..cafdab2 100644
--- a/include/X11/extensions/xcalibrateproto.h
+++ b/include/X11/extensions/xcalibrateproto.h
@@ -31,9 +31,9 @@
 typedef struct {
     CARD8   reqType;
     CARD8   xCalibrateReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
+    CARD16  length;
+    CARD32  majorVersion;
+    CARD32  minorVersion;
 } xXCalibrateQueryVersionReq;
 
 #define sz_xXCalibrateQueryVersionReq   12
@@ -41,14 +41,14 @@ typedef struct {
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  majorVersion;
+    CARD32  minorVersion;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
 } xXCalibrateQueryVersionReply;
 
 #define sz_xXCalibrateQueryVersionReply	32
@@ -56,9 +56,9 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   xCalibrateReqType;
-    CARD16  length B16;
-    CARD16  on B16;
-    CARD16  pad B16;
+    CARD16  length;
+    CARD16  on;
+    CARD16  pad;
 } xXCalibrateRawModeReq;
 
 #define sz_xXCalibrateRawModeReq	8
@@ -66,14 +66,14 @@ typedef struct {
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
-    CARD16  sequenceNumber B16;
+    CARD16  sequenceNumber;
     CARD32  status;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-    CARD32  pad7 B32;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+    CARD32  pad7;
 } xXCalibrateRawModeReply;
 
 #define sz_xXCalibrateRawModeReply	32
@@ -81,9 +81,9 @@ typedef struct {
 typedef struct {
     CARD8   reqType;
     CARD8   xCalibrateReqType;
-    CARD16  length B16;
-    CARD32  x B32;
-    CARD32  y B32;
+    CARD16  length;
+    CARD32  x;
+    CARD32  y;
 } xXCalibrateScreenToCoordReq;
 
 #define sz_xXCalibrateScreenToCoordReq	12
@@ -91,14 +91,14 @@ typedef struct {
 typedef struct {
     BYTE    type;   /* X_Reply */
     BYTE    pad1;
-    CARD16  sequenceNumber B16;
+    CARD16  sequenceNumber;
     CARD32  x;
     CARD32  y;
-    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;
 } xXCalibrateScreenToCoordReply;
 
 #define sz_xXCalibrateScreenToCoordReply	32
@@ -108,7 +108,7 @@ typedef struct {
 typedef struct {
     CARD8	type;
     CARD8	pad1;
-    CARD16	sequenceNumber B16;
+    CARD16	sequenceNumber;
     CARD16	x;
     CARD16	y;
     CARD16	pressure;