summaryrefslogtreecommitdiffstats
path: root/dcop/KDE-ICE/ICEproto.h
diff options
context:
space:
mode:
Diffstat (limited to 'dcop/KDE-ICE/ICEproto.h')
-rw-r--r--dcop/KDE-ICE/ICEproto.h34
1 files changed, 16 insertions, 18 deletions
diff --git a/dcop/KDE-ICE/ICEproto.h b/dcop/KDE-ICE/ICEproto.h
index ff848df04..f66b86ac0 100644
--- a/dcop/KDE-ICE/ICEproto.h
+++ b/dcop/KDE-ICE/ICEproto.h
@@ -37,8 +37,6 @@ typedef unsigned long CARD32;
#endif
typedef unsigned short CARD16;
typedef unsigned char CARD8;
-#define B32 :32
-#define B16 :16
#include <unistd.h>
#endif
@@ -46,18 +44,18 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 data[2];
- CARD32 length B32;
+ CARD32 length :32;
} iceMsg;
typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
- CARD16 errorClass B16;
- CARD32 length B32;
+ CARD16 errorClass :16;
+ CARD32 length :32;
CARD8 offendingMinorOpcode;
CARD8 severity;
- CARD16 unused B16;
- CARD32 offendingSequenceNum B32;
+ CARD16 unused :16;
+ CARD32 offendingSequenceNum :32;
/* n varying values */
/* p p = pad (n, 8) */
} iceErrorMsg;
@@ -67,7 +65,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 byteOrder;
CARD8 unused;
- CARD32 length B32;
+ CARD32 length :32;
} iceByteOrderMsg;
typedef struct {
@@ -75,7 +73,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionCount;
CARD8 authCount;
- CARD32 length B32;
+ CARD32 length :32;
CARD8 mustAuthenticate;
CARD8 unused[7];
/* i STRING vendor */
@@ -90,8 +88,8 @@ typedef struct {
CARD8 minorOpcode;
CARD8 authIndex;
CARD8 unused1;
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length :32;
+ CARD16 authDataLength :16;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -101,8 +99,8 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 unused1[2];
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length :32;
+ CARD16 authDataLength :16;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -112,8 +110,8 @@ typedef struct {
CARD8 majorOpcode;
CARD8 minorOpcode;
CARD8 unused1[2];
- CARD32 length B32;
- CARD16 authDataLength B16;
+ CARD32 length :32;
+ CARD16 authDataLength :16;
CARD8 unused2[6];
/* n varying data */
/* p p = pad (n, 8) */
@@ -124,7 +122,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionIndex;
CARD8 unused;
- CARD32 length B32;
+ CARD32 length :32;
/* i STRING vendor */
/* j STRING release */
/* p p = pad (i+j, 8) */
@@ -135,7 +133,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 protocolOpcode;
CARD8 mustAuthenticate;
- CARD32 length B32;
+ CARD32 length :32;
CARD8 versionCount;
CARD8 authCount;
CARD8 unused[6];
@@ -152,7 +150,7 @@ typedef struct {
CARD8 minorOpcode;
CARD8 versionIndex;
CARD8 protocolOpcode;
- CARD32 length B32;
+ CARD32 length :32;
/* i STRING vendor */
/* j STRING release */
/* p p = pad (i+j, 8) */