summaryrefslogtreecommitdiff
path: root/include/X11/extensions/xtestproto.h
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2018-06-16 14:34:14 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-10 12:31:50 -0800
commit641db34376d18ed5b76ff8883284bef4898d71be (patch)
tree6005c776825c1a869140b276cea32c839c53c239 /include/X11/extensions/xtestproto.h
parentaf9b5f43439378efd1e12d11d487a71f42790fec (diff)
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>
Diffstat (limited to 'include/X11/extensions/xtestproto.h')
-rw-r--r--include/X11/extensions/xtestproto.h64
1 files changed, 32 insertions, 32 deletions
diff --git a/include/X11/extensions/xtestproto.h b/include/X11/extensions/xtestproto.h
index 4f8db26..9595ac1 100644
--- a/include/X11/extensions/xtestproto.h
+++ b/include/X11/extensions/xtestproto.h
@@ -41,48 +41,48 @@ in this Software without prior written authorization from The Open Group.
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestGetVersion */
- CARD16 length B16;
+ CARD16 length;
CARD8 majorVersion;
CARD8 pad;
- CARD16 minorVersion B16;
+ CARD16 minorVersion;
} xXTestGetVersionReq;
#define sz_xXTestGetVersionReq 8
typedef struct {
BYTE type; /* X_Reply */
CARD8 majorVersion;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 minorVersion B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD16 minorVersion;
+ CARD16 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXTestGetVersionReply;
#define sz_xXTestGetVersionReply 32
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestCompareCursor */
- CARD16 length B16;
- Window window B32;
- Cursor cursor B32;
+ CARD16 length;
+ Window window;
+ Cursor cursor;
} xXTestCompareCursorReq;
#define sz_xXTestCompareCursorReq 12
typedef struct {
BYTE type; /* X_Reply */
BOOL same;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 pad0;
+ CARD32 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
} xXTestCompareCursorReply;
#define sz_xXTestCompareCursorReply 32
@@ -90,17 +90,17 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestFakeInput */
- CARD16 length B16;
+ CARD16 length;
BYTE type;
BYTE detail;
- CARD16 pad0 B16;
- Time time B32;
- Window root B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- INT16 rootX B16, rootY B16;
- CARD32 pad3 B32;
- CARD16 pad4 B16;
+ CARD16 pad0;
+ Time time;
+ Window root;
+ CARD32 pad1;
+ CARD32 pad2;
+ INT16 rootX, rootY;
+ CARD32 pad3;
+ CARD16 pad4;
CARD8 pad5;
CARD8 deviceid;
} xXTestFakeInputReq;
@@ -109,7 +109,7 @@ typedef struct {
typedef struct {
CARD8 reqType; /* always XTestReqCode */
CARD8 xtReqType; /* always X_XTestGrabControl */
- CARD16 length B16;
+ CARD16 length;
BOOL impervious;
CARD8 pad0;
CARD8 pad1;