diff --git a/Xi/extinit.c b/Xi/extinit.c index 33dacbeb4..058218905 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -520,7 +520,7 @@ static void SEventDeviceValuator(deviceValuator * from, deviceValuator * to) { int i; - INT32 *ip B32; + INT32 *ip; *to = *from; swaps(&to->sequenceNumber); @@ -544,7 +544,7 @@ static void SDeviceStateNotifyEvent(deviceStateNotify * from, deviceStateNotify * to) { int i; - INT32 *ip B32; + INT32 *ip; *to = *from; swaps(&to->sequenceNumber); diff --git a/hw/xquartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h index 71346c428..341d72bb4 100644 --- a/hw/xquartz/xpr/appledristr.h +++ b/hw/xquartz/xpr/appledristr.h @@ -50,126 +50,126 @@ typedef struct _AppleDRIQueryVersion { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIQueryVersion */ - CARD16 length B16; + CARD16 length; } xAppleDRIQueryVersionReq; #define sz_xAppleDRIQueryVersionReq 4 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of DRI protocol */ - CARD16 minorVersion B16; /* minor version of DRI protocol */ - CARD32 patchVersion B32; /* patch version of DRI protocol */ - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD16 majorVersion; /* major version of DRI protocol */ + CARD16 minorVersion; /* minor version of DRI protocol */ + CARD32 patchVersion; /* patch version of DRI protocol */ + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleDRIQueryVersionReply; #define sz_xAppleDRIQueryVersionReply 32 typedef struct _AppleDRIQueryDirectRenderingCapable { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* X_DRIQueryDirectRenderingCapable */ - CARD16 length B16; - CARD32 screen B32; + CARD16 length; + CARD32 screen; } xAppleDRIQueryDirectRenderingCapableReq; #define sz_xAppleDRIQueryDirectRenderingCapableReq 8 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; + CARD16 sequenceNumber; + CARD32 length; BOOL isCapable; BOOL pad2; BOOL pad3; BOOL pad4; - CARD32 pad5 B32; - CARD32 pad6 B32; - CARD32 pad7 B32; - CARD32 pad8 B32; - CARD32 pad9 B32; + CARD32 pad5; + CARD32 pad6; + CARD32 pad7; + CARD32 pad8; + CARD32 pad9; } xAppleDRIQueryDirectRenderingCapableReply; #define sz_xAppleDRIQueryDirectRenderingCapableReply 32 typedef struct _AppleDRIAuthConnection { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICloseConnection */ - CARD16 length B16; - CARD32 screen B32; - CARD32 magic B32; + CARD16 length; + CARD32 screen; + CARD32 magic; } xAppleDRIAuthConnectionReq; #define sz_xAppleDRIAuthConnectionReq 12 typedef struct { BYTE type; BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 authenticated B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 authenticated; + CARD32 pad2; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleDRIAuthConnectionReply; #define zx_xAppleDRIAuthConnectionReply 32 typedef struct _AppleDRICreateSurface { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRICreateSurface */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; - CARD32 client_id B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; + CARD32 client_id; } xAppleDRICreateSurfaceReq; #define sz_xAppleDRICreateSurfaceReq 16 typedef struct { BYTE type; /* X_Reply */ BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 key_0 B32; - CARD32 key_1 B32; - CARD32 uid B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 key_0; + CARD32 key_1; + CARD32 uid; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleDRICreateSurfaceReply; #define sz_xAppleDRICreateSurfaceReply 32 typedef struct _AppleDRIDestroySurface { CARD8 reqType; /* always DRIReqCode */ CARD8 driReqType; /* always X_DRIDestroySurface */ - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xAppleDRIDestroySurfaceReq; #define sz_xAppleDRIDestroySurfaceReq 12 typedef struct _AppleDRINotify { BYTE type; /* always eventBase + event type */ BYTE kind; - CARD16 sequenceNumber B16; - CARD32 time B32; /* time of change */ - CARD32 pad1 B32; - CARD32 arg B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; + CARD16 sequenceNumber; + CARD32 time; /* time of change */ + CARD32 pad1; + CARD32 arg; + CARD32 pad3; + CARD32 pad4; + CARD32 pad5; + CARD32 pad6; } xAppleDRINotifyEvent; #define sz_xAppleDRINotifyEvent 32 typedef struct { CARD8 reqType; CARD8 driReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; BOOL doubleSwap; CARD8 pad1, pad2, pad3; } xAppleDRICreateSharedBufferReq; @@ -179,14 +179,14 @@ typedef struct { typedef struct { BYTE type; BYTE data1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 stringLength B32; /* 0 on error */ - CARD32 width B32; - CARD32 height B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; + CARD16 sequenceNumber; + CARD32 length; + CARD32 stringLength; /* 0 on error */ + CARD32 width; + CARD32 height; + CARD32 pad1; + CARD32 pad2; + CARD32 pad3; } xAppleDRICreateSharedBufferReply; #define sz_xAppleDRICreateSharedBufferReply 32 @@ -194,9 +194,9 @@ typedef struct { typedef struct { CARD8 reqType; CARD8 driReqType; - CARD16 length B16; - CARD32 screen B32; - CARD32 drawable B32; + CARD16 length; + CARD32 screen; + CARD32 drawable; } xAppleDRISwapBuffersReq; #define sz_xAppleDRISwapBuffersReq 12 @@ -204,9 +204,9 @@ typedef struct { typedef struct { CARD8 reqType; /*1 */ CARD8 driReqType; /*2 */ - CARD16 length B16; /*4 */ - CARD32 screen B32; /*8 */ - CARD32 drawable B32; /*12 */ + CARD16 length; /*4 */ + CARD32 screen; /*8 */ + CARD32 drawable; /*12 */ } xAppleDRICreatePixmapReq; #define sz_xAppleDRICreatePixmapReq 12 @@ -214,14 +214,14 @@ typedef struct { typedef struct { BYTE type; /*1 */ BOOL pad1; /*2 */ - CARD16 sequenceNumber B16; /*4 */ - CARD32 length B32; /*8 */ - CARD32 width B32; /*12 */ - CARD32 height B32; /*16 */ - CARD32 pitch B32; /*20 */ - CARD32 bpp B32; /*24 */ - CARD32 size B32; /*28 */ - CARD32 stringLength B32; /*32 */ + CARD16 sequenceNumber; /*4 */ + CARD32 length; /*8 */ + CARD32 width; /*12 */ + CARD32 height; /*16 */ + CARD32 pitch; /*20 */ + CARD32 bpp; /*24 */ + CARD32 size; /*28 */ + CARD32 stringLength; /*32 */ } xAppleDRICreatePixmapReply; #define sz_xAppleDRICreatePixmapReply 32 @@ -229,8 +229,8 @@ typedef struct { typedef struct { CARD8 reqType; /*1 */ CARD8 driReqType; /*2 */ - CARD16 length B16; /*4 */ - CARD32 drawable B32; /*8 */ + CARD16 length; /*4 */ + CARD32 drawable; /*8 */ } xAppleDRIDestroyPixmapReq; #define sz_xAppleDRIDestroyPixmapReq 8