1 files changed, 35 insertions, 35 deletions

diff --git a/include/X11/extensions/securproto.h b/include/X11/extensions/securproto.h
index 409a4c5..d9e120c 100644
--- a/include/X11/extensions/securproto.h
+++ b/include/X11/extensions/securproto.h
@@ -36,34 +36,34 @@ from The Open Group.
 typedef struct {
     CARD8       reqType;
     CARD8       securityReqType;
-    CARD16      length B16;
-    CARD16      majorVersion B16;
-    CARD16      minorVersion B16;
+    CARD16      length;
+    CARD16      majorVersion;
+    CARD16      minorVersion;
 } xSecurityQueryVersionReq;
 #define sz_xSecurityQueryVersionReq 	8
 
 typedef struct {
     CARD8   type;
     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;
  } xSecurityQueryVersionReply;
 #define sz_xSecurityQueryVersionReply  	32
 
 typedef struct {
     CARD8       reqType;
     CARD8       securityReqType;
-    CARD16      length B16;
-    CARD16	nbytesAuthProto B16;
-    CARD16	nbytesAuthData B16;
-    CARD32	valueMask B32;
+    CARD16      length;
+    CARD16      nbytesAuthProto;
+    CARD16      nbytesAuthData;
+    CARD32      valueMask;
     /* auth protocol name padded to 4 bytes */
     /* auth protocol data padded to 4 bytes */
     /* list of CARD32 values, if any */
@@ -73,37 +73,37 @@ typedef struct {
 typedef struct {
     CARD8   type;
     CARD8   pad0;
-    CARD16  sequenceNumber B16;
-    CARD32  length	 B32;
-    CARD32  authId	 B32;
-    CARD16  dataLength   B16;
-    CARD16  pad1	 B16;
-    CARD32  pad2	 B32;
-    CARD32  pad3	 B32;
-    CARD32  pad4	 B32;
-    CARD32  pad5	 B32;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  authId;
+    CARD16  dataLength;
+    CARD16  pad1;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
  } xSecurityGenerateAuthorizationReply;
 #define sz_xSecurityGenerateAuthorizationReply  	32
 
 typedef struct {
     CARD8       reqType;
     CARD8       securityReqType;
-    CARD16      length B16;
-    CARD32	authId B32;
+    CARD16      length;
+    CARD32      authId;
 } xSecurityRevokeAuthorizationReq;
 #define sz_xSecurityRevokeAuthorizationReq 8
 
 typedef struct _xSecurityAuthorizationRevokedEvent {
     BYTE	type;
     BYTE	detail;
-    CARD16	sequenceNumber B16;
-    CARD32	authId B32;
-    CARD32	pad0	 B32;
-    CARD32	pad1	 B32;
-    CARD32	pad2	 B32;
-    CARD32	pad3	 B32;
-    CARD32	pad4	 B32;
-    CARD32	pad5	 B32;
+    CARD16	sequenceNumber;
+    CARD32	authId;
+    CARD32	pad0;
+    CARD32	pad1;
+    CARD32	pad2;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
 } xSecurityAuthorizationRevokedEvent;
 #define sz_xSecurityAuthorizationRevokedEvent 32