summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-10 13:13:45 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2018-11-10 13:13:45 -0800
commitdc73ec034c9083b8c7d980e80eb6d4c88bcfaa51 (patch)
tree42b4936d919a513ee2be734615bc4174337a8a70
parentf66955f7250d7c150dfb97862878acc2222781e5 (diff)
Remove obsolete B16 & B32 tags in struct definitions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--doc/ICElib.xml2
-rw-r--r--include/X11/ICE/ICEproto.h32
2 files changed, 17 insertions, 17 deletions
diff --git a/doc/ICElib.xml b/doc/ICElib.xml
index 5837e89..6041e77 100644
--- a/doc/ICElib.xml
+++ b/doc/ICElib.xml
@@ -2738,7 +2738,7 @@ headers:
CARD8 major_opcode;
CARD8 minor_opcode;
CARD8 data[2];
- CARD32 length B32;
+ CARD32 length;
</literallayout>
<para>
diff --git a/include/X11/ICE/ICEproto.h b/include/X11/ICE/ICEproto.h
index 1fcbe6b..5726631 100644
--- a/include/X11/ICE/ICEproto.h
+++ b/include/X11/ICE/ICEproto.h
@@ -35,18 +35,18 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 data[2];
- CARD32 length B32;
+ CARD32 length;
} iceMsg;
typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
- CARD16 errorClass B16;
- CARD32 length B32;
+ CARD16 errorClass;
+ CARD32 length;
CARD8 offendingMinorOpcode;
CARD8 severity;
- CARD16 unused B16;
- CARD32 offendingSequenceNum B32;
+ CARD16 unused;
+ CARD32 offendingSequenceNum;
/* n varying values */
/* p p = pad (n, 8) */
} iceErrorMsg;
@@ -56,7 +56,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 byteOrder;
CARD8 unused;
- CARD32 length B32;
+ CARD32 length;
} iceByteOrderMsg;
typedef struct {
@@ -64,7 +64,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionCount;
CARD8 authCount;
- CARD32 length B32;
+ CARD32 length;
CARD8 mustAuthenticate;
CARD8 unused[7];
/* i STRING vendor */
@@ -79,8 +79,8 @@ typedef struct {
CARD8 minorOpcode;
CARD8 authIndex;
CARD8 unused1;
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length;
+ CARD16 authDataLength;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -90,8 +90,8 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 unused1[2];
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length;
+ CARD16 authDataLength;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -101,8 +101,8 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 unused1[2];
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length;
+ CARD16 authDataLength;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -113,7 +113,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionIndex;
CARD8 unused;
- CARD32 length B32;
+ CARD32 length;
/* i STRING vendor */
/* j STRING release */
/* p p = pad (i+j, 8) */
@@ -124,7 +124,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 protocolOpcode;
CARD8 mustAuthenticate;
- CARD32 length B32;
+ CARD32 length;
CARD8 versionCount;
CARD8 authCount;
CARD8 unused[6];
@@ -141,7 +141,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionIndex;
CARD8 protocolOpcode;
- CARD32 length B32;
+ CARD32 length;
/* i STRING vendor */
/* j STRING release */
/* p p = pad (i+j, 8) */