From 036019dcab226d70e456c7adc5e79364eb86b72b Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@freedesktop.org>
Date: Fri, 6 Oct 2006 21:13:22 -0700
Subject: [PATCH] Replace structures attempting to provide C type safety with
 CARD32 typedefs

---
 src/xproto.xml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/xproto.xml b/src/xproto.xml
index 78fa4bf..925169e 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -57,25 +57,15 @@ authorization from the authors.
     <field type="GCONTEXT" name="gcontext" />
   </union>
   
-  <struct name="VISUALID">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="VISUALID" />
 
-  <struct name="TIMESTAMP">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="TIMESTAMP" />
 
-  <struct name="KEYSYM">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="KEYSYM" />
 
-  <struct name="KEYCODE">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="KEYCODE" />
 
-  <struct name="BUTTON">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="BUTTON" />
 
   <struct name="POINT">
     <field type="INT16" name="x" />
-- 
2.34.1