1 files changed, 58 insertions, 58 deletions

diff --git a/include/X11/extensions/windowswmstr.h b/include/X11/extensions/windowswmstr.h
index 37ceb53..b4e75aa 100644
--- a/include/X11/extensions/windowswmstr.h
+++ b/include/X11/extensions/windowswmstr.h
@@ -45,124 +45,124 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 typedef struct _WindowsWMQueryVersion {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMQueryVersion */
-    CARD16	length B16;
+    CARD16	length;
 } xWindowsWMQueryVersionReq;
 #define sz_xWindowsWMQueryVersionReq	4
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of WM protocol */
-    CARD16	minorVersion B16;	/* minor version of WM protocol */
-    CARD32	patchVersion B32;       /* patch version of WM protocol */
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    CARD16	majorVersion;		/* major version of WM protocol */
+    CARD16	minorVersion;		/* minor version of WM protocol */
+    CARD32	patchVersion;		/* patch version of WM protocol */
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xWindowsWMQueryVersionReply;
 #define sz_xWindowsWMQueryVersionReply	32
 
 typedef struct _WindowsWMDisableUpdate {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMDisableUpdate */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xWindowsWMDisableUpdateReq;
 #define sz_xWindowsWMDisableUpdateReq	8
 
 typedef struct _WindowsWMReenableUpdate {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMReenableUpdate */
-    CARD16	length B16;
-    CARD32	screen B32;
+    CARD16	length;
+    CARD32	screen;
 } xWindowsWMReenableUpdateReq;
 #define sz_xWindowsWMReenableUpdateReq	8
 
 typedef struct _WindowsWMSelectInput {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMSelectInput */
-    CARD16	length B16;
-    CARD32	mask B32;
+    CARD16	length;
+    CARD32	mask;
 } xWindowsWMSelectInputReq;
 #define sz_xWindowsWMSelectInputReq	8
 
 typedef struct _WindowsWMNotify {
 	BYTE	type;		/* always eventBase + event type */
 	BYTE	kind;
-	CARD16	sequenceNumber B16;
-	Window	window B32;
-	Time	time B32;	/* time of change */
-	CARD16	pad1 B16;
-	CARD32	arg B32;
-	INT16	x B16;
-	INT16	y B16;
-	CARD16	w B16;
-	CARD16	h B16;
+	CARD16	sequenceNumber;
+	Window	window;
+	Time	time;		/* time of change */
+	CARD16	pad1;
+	CARD32	arg;
+	INT16	x;
+	INT16	y;
+	CARD16	w;
+	CARD16	h;
 } xWindowsWMNotifyEvent;
 #define sz_xWindowsWMNotifyEvent	28
 
 typedef struct _WindowsWMSetFrontProcess {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMSetFrontProcess */
-    CARD16	length B16;
+    CARD16	length;
 } xWindowsWMSetFrontProcessReq;
 #define sz_xWindowsWMSetFrontProcessReq 4
 
 typedef struct _WindowsWMFrameGetRect {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMFrameGetRect */
-    CARD16	length B16;
-    CARD32	frame_style B32;
-    CARD32	frame_style_ex B32;
-    CARD16	frame_rect B16;
-    INT16	ix B16;
-    INT16	iy B16;
-    CARD16	iw B16;
-    CARD16	ih B16;
-    CARD16	pad1 B16;
+    CARD16	length;
+    CARD32	frame_style;
+    CARD32	frame_style_ex;
+    CARD16	frame_rect;
+    INT16	ix;
+    INT16	iy;
+    CARD16	iw;
+    CARD16	ih;
+    CARD16	pad1;
 } xWindowsWMFrameGetRectReq;
 #define sz_xWindowsWMFrameGetRectReq	24
 
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    INT16	x B16;
-    INT16	y B16;
-    CARD16	w B16;
-    CARD16	h B16;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
+    CARD16	sequenceNumber;
+    CARD32	length;
+    INT16	x;
+    INT16	y;
+    CARD16	w;
+    CARD16	h;
+    CARD32	pad3;
+    CARD32	pad4;
+    CARD32	pad5;
+    CARD32	pad6;
 } xWindowsWMFrameGetRectReply;
 #define sz_xWindowsWMFrameGetRectReply	32
 
 typedef struct _WindowsWMFrameDraw {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMFrameDraw */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	window B32;
-    CARD32	frame_style B32;
-    CARD32	frame_style_ex B32;
-    INT16	ix B16;
-    INT16	iy B16;
-    CARD16	iw B16;
-    CARD16	ih B16;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	window;
+    CARD32	frame_style;
+    CARD32	frame_style_ex;
+    INT16	ix;
+    INT16	iy;
+    CARD16	iw;
+    CARD16	ih;
 } xWindowsWMFrameDrawReq;
 #define sz_xWindowsWMFrameDrawReq	28
 
 typedef struct _WindowsWMFrameSetTitle {
     CARD8	reqType;		/* always WMReqCode */
     CARD8	wmReqType;		/* always X_WMFrameSetTitle */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	window B32;
-    CARD32	title_length B32;
+    CARD16	length;
+    CARD32	screen;
+    CARD32	window;
+    CARD32	title_length;
 } xWindowsWMFrameSetTitleReq;
 #define sz_xWindowsWMFrameSetTitleReq	16