Remove arbitrary division between xcb_types and xproto by merging

xcb_types.xml into xproto.xml.

5 files changed, 6 insertions, 20 deletions

diff --git a/debian/libxcb0-dev.install b/debian/libxcb0-dev.install
index 6668a0e..2f05d6d 100644
--- a/debian/libxcb0-dev.install
+++ b/debian/libxcb0-dev.install
@@ -1,7 +1,6 @@
 usr/include/X11/XCB/bigreq.h
 usr/include/X11/XCB/xc_misc.h
 usr/include/X11/XCB/xcb.h
-usr/include/X11/XCB/xcb_types.h
 usr/include/X11/XCB/xcbext.h
 usr/include/X11/XCB/xcbxlib.h
 usr/include/X11/XCB/xproto.h
diff --git a/src/.gitignore b/src/.gitignore
index 1b0d39b..6ddd427 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,5 @@
 xproto.c
 xproto.h
 xcb_des.c
-xcb_types.c
-xcb_types.h
 extensions
 X11
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f59719..f62c6e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,8 @@ ESSENTIAL_EXTENSIONS = \
 		extensions/xc_misc.h \
 		extensions/xc_misc.c
 
-COREHEADERS = xproto.h xcb_types.h
-CORESOURCES = xproto.c xcb_types.c
+COREHEADERS = xproto.h
+CORESOURCES = xproto.c
 COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
diff --git a/src/c-client.xsl b/src/c-client.xsl
index 6049bac..8a2d82e 100644
--- a/src/c-client.xsl
+++ b/src/c-client.xsl
@@ -62,19 +62,9 @@ authorization from the authors.
     <xsl:for-each select="/xcb/import">
       <path><xsl:value-of select="concat($extension-path, ., '.xml')" /></path>
     </xsl:for-each>
-    <xsl:choose>
-      <xsl:when test="$header='xproto'">
-        <path><xsl:value-of select="concat($base-path,
-                                           'xcb_types.xml')" /></path>
-      </xsl:when>
-      <xsl:when test="$header='xcb_types'" />
-      <xsl:otherwise>
-        <path><xsl:value-of select="concat($base-path,
-                                           'xproto.xml')" /></path>
-        <path><xsl:value-of select="concat($base-path,
-                                           'xcb_types.xml')" /></path>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:if test="not($header='xproto')">
+      <path><xsl:value-of select="concat($base-path, 'xproto.xml')" /></path>
+    </xsl:if>
   </xsl:variable>
   <xsl:variable name="search-path" select="e:node-set($search-path-rtf)/path"/>
 
diff --git a/src/xcb.h b/src/xcb.h
index 85d0658..ca58e3d 100644
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -156,8 +156,7 @@ typedef struct {
 } XCBVoidCookie;
 
 
-/* Include the generated xproto and xcb_types headers. */
-#include "xcb_types.h"
+/* Include the generated xproto header. */
 #include "xproto.h"