Commit 75fead5b authored by Josh Triplett's avatar Josh Triplett
Browse files

Remove arbitrary division between xcb_types and xproto by merging

xcb_types.xml into xproto.xml.
parent 62749d54
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
......
xproto.c
xproto.h
xcb_des.c
xcb_types.c
xcb_types.h
extensions
X11
......@@ -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)
......
......@@ -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"/>
......
......@@ -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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment