From 641db34376d18ed5b76ff8883284bef4898d71be Mon Sep 17 00:00:00 2001 From: Alan Coopersmith 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 Acked-by: Keith Packard Reviewed-by: Emil Velikov --- include/X11/PM/PMproto.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/X11/PM') diff --git a/include/X11/PM/PMproto.h b/include/X11/PM/PMproto.h index 754e460..1395905 100644 --- a/include/X11/PM/PMproto.h +++ b/include/X11/PM/PMproto.h @@ -34,8 +34,8 @@ from The Open Group. typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; /* == 1 */ - CARD16 authLen B16; - CARD32 length B32; + CARD16 authLen; + CARD32 length; /* STRING proxy-service */ /* STRING server-address */ /* STRING host-address */ @@ -52,7 +52,7 @@ typedef struct { CARD8 minorOpcode; /* == 2 */ CARD8 status; CARD8 unused; - CARD32 length B32; + CARD32 length; /* STRING proxy-address */ /* STRING failure-reason */ } pmGetProxyAddrReplyMsg; @@ -63,8 +63,8 @@ typedef struct { typedef struct { CARD8 majorOpcode; CARD8 minorOpcode; /* == 3 */ - CARD16 unused B16; - CARD32 length B32; + CARD16 unused; + CARD32 length; /* STRING proxy-service */ } pmStartProxyMsg; -- cgit v1.2.3