summaryrefslogtreecommitdiff
path: root/include/X11/extensions/panoramiXproto.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/panoramiXproto.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/panoramiXproto.h')
-rw-r--r--include/X11/extensions/panoramiXproto.h128
1 files changed, 64 insertions, 64 deletions
diff --git a/include/X11/extensions/panoramiXproto.h b/include/X11/extensions/panoramiXproto.h
index ee1c246..5de1cf0 100644
--- a/include/X11/extensions/panoramiXproto.h
+++ b/include/X11/extensions/panoramiXproto.h
@@ -44,10 +44,10 @@ Equipment Corporation.
typedef struct _PanoramiXQueryVersion {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXQueryVersion */
- CARD16 length B16;
+ CARD16 length;
CARD8 clientMajor;
CARD8 clientMinor;
- CARD16 unused B16;
+ CARD16 unused;
} xPanoramiXQueryVersionReq;
#define sz_xPanoramiXQueryVersionReq 8
@@ -55,15 +55,15 @@ typedef struct _PanoramiXQueryVersion {
typedef struct {
CARD8 type; /* must be X_Reply */
CARD8 pad1; /* unused */
- CARD16 sequenceNumber B16; /* last sequence number */
- CARD32 length B32; /* 0 */
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
- CARD32 pad6 B32; /* unused */
+ CARD16 sequenceNumber; /* last sequence number */
+ CARD32 length; /* 0 */
+ CARD16 majorVersion;
+ CARD16 minorVersion;
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
+ CARD32 pad6; /* unused */
} xPanoramiXQueryVersionReply;
#define sz_xPanoramiXQueryVersionReply 32
@@ -72,22 +72,22 @@ typedef struct {
typedef struct _PanoramiXGetState {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetState */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xPanoramiXGetStateReq;
#define sz_xPanoramiXGetStateReq 8
typedef struct {
BYTE type;
BYTE state;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 window;
+ CARD32 pad1; /* unused */
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
} xPanoramiXGetStateReply;
#define sz_panoramiXGetStateReply 32
@@ -95,45 +95,45 @@ typedef struct {
typedef struct _PanoramiXGetScreenCount {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetScreenCount */
- CARD16 length B16;
- CARD32 window B32;
+ CARD16 length;
+ CARD32 window;
} xPanoramiXGetScreenCountReq;
#define sz_xPanoramiXGetScreenCountReq 8
typedef struct {
BYTE type;
BYTE ScreenCount;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 pad1 B32; /* unused */
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
- CARD32 pad4 B32; /* unused */
- CARD32 pad5 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 window;
+ CARD32 pad1; /* unused */
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
+ CARD32 pad4; /* unused */
+ CARD32 pad5; /* unused */
} xPanoramiXGetScreenCountReply;
#define sz_panoramiXGetScreenCountReply 32
typedef struct _PanoramiXGetScreenSize {
CARD8 reqType; /* always PanoramiXReqCode */
CARD8 panoramiXReqType; /* always X_PanoramiXGetState */
- CARD16 length B16;
- CARD32 window B32;
- CARD32 screen B32;
+ CARD16 length;
+ CARD32 window;
+ CARD32 screen;
} xPanoramiXGetScreenSizeReq;
#define sz_xPanoramiXGetScreenSizeReq 12
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 window B32;
- CARD32 screen B32;
- CARD32 pad2 B32; /* unused */
- CARD32 pad3 B32; /* unused */
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 width;
+ CARD32 height;
+ CARD32 window;
+ CARD32 screen;
+ CARD32 pad2; /* unused */
+ CARD32 pad3; /* unused */
} xPanoramiXGetScreenSizeReply;
#define sz_panoramiXGetScreenSizeReply 32
@@ -142,21 +142,21 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 panoramiXReqType;
- CARD16 length B16;
+ CARD16 length;
} xXineramaIsActiveReq;
#define sz_xXineramaIsActiveReq 4
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 state B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 state;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXineramaIsActiveReply;
#define sz_XineramaIsActiveReply 32
@@ -164,29 +164,29 @@ typedef struct {
typedef struct {
CARD8 reqType;
CARD8 panoramiXReqType;
- CARD16 length B16;
+ CARD16 length;
} xXineramaQueryScreensReq;
#define sz_xXineramaQueryScreensReq 4
typedef struct {
BYTE type;
CARD8 pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 number B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
+ CARD16 sequenceNumber;
+ CARD32 length;
+ CARD32 number;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
} xXineramaQueryScreensReply;
#define sz_XineramaQueryScreensReply 32
typedef struct {
- INT16 x_org B16;
- INT16 y_org B16;
- CARD16 width B16;
- CARD16 height B16;
+ INT16 x_org;
+ INT16 y_org;
+ CARD16 width;
+ CARD16 height;
} xXineramaScreenInfo;
#define sz_XineramaScreenInfo 8