Remove XID wrapper structures and replace them with uint32_t typedefs

[free-sw/xcb/libxcb] / src / c-client.xsl

diff --git a/src/c-client.xsl b/src/c-client.xsl
index 188e8b0..4a7b50e 100644 (file)
--- a/src/c-client.xsl
+++ b/src/c-client.xsl
@@ -89,11 +89,6 @@ authorization from the authors.
         <constant type="xcb_extension_t" name="{xcb:xcb-prefix()}_id">
           <xsl:attribute name="value">{ "<xsl:value-of select="@extension-xname" />" }</xsl:attribute>
         </constant>
-        <function type="const xcb_query_extension_reply_t *" name="{xcb:xcb-prefix('init')}">
-          <field type="xcb_connection_t *" name="c" />
-          <l>return xcb_get_extension_data(c, &amp;<!--
-          --><xsl:value-of select="xcb:xcb-prefix()" />_id);</l>
-        </function>
       </xsl:if>
       <xsl:apply-templates mode="pass1" />
     </xcb>
@@ -409,17 +404,9 @@ authorization from the authors.
   </xsl:template>
 
   <xsl:template match="xidtype" mode="pass1">
-    <struct name="{xcb:xcb-prefix(@name)}_t">
-      <field type="uint32_t" name="xid" />
-    </struct>
+    <typedef oldname="uint32_t" newname="{xcb:xcb-prefix(@name)}_t" />
     <iterator ref="{xcb:xcb-prefix(@name)}" />
     <iterator-functions ref="{xcb:xcb-prefix(@name)}" />
-    <function type="{xcb:xcb-prefix(@name)}_t" name="{xcb:xcb-prefix(@name)}_new">
-      <field type="xcb_connection_t *" name="c" />
-      <l><xsl:value-of select="concat(xcb:xcb-prefix(@name), '_t')" /> ret;</l>
-      <l>ret.xid = xcb_generate_id(c);</l>
-      <l>return ret;</l>
-    </function>
   </xsl:template>
 
   <xsl:template match="struct|union" mode="pass1">