[Xcb-commit] 2 commits - xcb

[Jamey Sharp]

 xcb/src/Makefile.am |    2 +-
 xcb/src/xcb_conn.c  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 60d98c145d83b7c9821582e1591b8c04b49cff3b (from 4142af0afc73d8afda86962d51d146aa069f986f)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Fri Sep 22 15:37:49 2006 -0700

    Make xcb_conn.c agree that XCBSetupReq is now XCBSetupRequest.

diff --git a/xcb/src/xcb_conn.c b/xcb/src/xcb_conn.c
index de1f6e4..c00eccf 100644
--- a/xcb/src/xcb_conn.c
+++ b/xcb/src/xcb_conn.c
@@ -62,7 +62,7 @@ static int set_fd_flags(const int fd)
 static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
 {
     static const char pad[3];
-    XCBSetupReq out;
+    XCBSetupRequest out;
     struct iovec parts[6];
     int count = 0;
     int endian = 0x01020304;
@@ -79,9 +79,9 @@ static int write_setup(XCBConnection *c,
     out.protocol_minor_version = X_PROTOCOL_REVISION;
     out.authorization_protocol_name_len = 0;
     out.authorization_protocol_data_len = 0;
-    parts[count].iov_len = sizeof(XCBSetupReq);
+    parts[count].iov_len = sizeof(XCBSetupRequest);
     parts[count++].iov_base = &out;
-    parts[count].iov_len = XCB_PAD(sizeof(XCBSetupReq));
+    parts[count].iov_len = XCB_PAD(sizeof(XCBSetupRequest));
     parts[count++].iov_base = (char *) pad;
 
     if(auth_info)
diff-tree 4142af0afc73d8afda86962d51d146aa069f986f (from e2116cc271f39e7cfab8fadd07ef6b474ea2272a)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Sep 22 11:53:21 2006 -0700

    List xproto.xml path explicitly instead of relying on GNU Make $< expansion
    
    (Some non-gnu makes, such as Solaris make, only recognize $< in implicit
     suffix rules, not explicit ones like this.)

diff --git a/xcb/src/Makefile.am b/xcb/src/Makefile.am
index 43f7236..0715708 100644
--- a/xcb/src/Makefile.am
+++ b/xcb/src/Makefile.am
@@ -221,7 +221,7 @@ SUFFIXES = .xml
 	            -o $@ $(srcdir)/c-client.xsl $< 
 
 xproto.xml: $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml
-	$(LN_S) $< $@
+	$(LN_S) $(XCBPROTO_XCBINCLUDEDIR)/xproto.xml $@
 
 $(EXTENSION_XML):
 	[ -d extensions ] || mkdir extensions