[Xcb-commit] 2 commits - xcb

[Ian Osgood]

 xcb/src/xcb_auth.c |    2 +-
 xcb/src/xcb_util.c |    8 +++++++-
 xcb/src/xcbint.h   |    5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
diff-tree bd1050627c6fd808d56e173bb01090bfb6212560 (from parents)
Merge: 7b21a51c2cfece99136fe88fee96caa3631b77ea cb4c7c1fdd8d820728f9e2552ccdb2af9b4d949d
Author: Ian Osgood <iano at quirkster.com>
Date:   Mon Mar 13 10:36:52 2006 -0800

    Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb

diff-tree 7b21a51c2cfece99136fe88fee96caa3631b77ea (from f642ba0d95028206a29755a397455607b8af65a3)
Author: Ian Osgood <iano at quirkster.com>
Date:   Mon Mar 13 10:36:13 2006 -0800

    Remove last deprecation warning.

diff --git a/xcb/src/xcb_auth.c b/xcb/src/xcb_auth.c
index 1b5651b..3971010 100644
--- a/xcb/src/xcb_auth.c
+++ b/xcb/src/xcb_auth.c
@@ -208,7 +208,7 @@ static int compute_auth(XCBAuthInfo *inf
     return 0;   /* Unknown authorization type */
 }
 
-int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
+int _xcb_get_auth_info(int fd, XCBAuthInfo *info)
 {
     /* code adapted from Xlib/ConnDis.c, xtrans/Xtranssocket.c,
        xtrans/Xtransutils.c */
diff --git a/xcb/src/xcb_util.c b/xcb/src/xcb_util.c
index 4ad779a..93e180c 100644
--- a/xcb/src/xcb_util.c
+++ b/xcb/src/xcb_util.c
@@ -40,6 +40,7 @@
 
 #include "xcb.h"
 #include "xcbext.h"
+#include "xcbint.h"
 
 int XCBPopcount(CARD32 mask)
 {
@@ -162,7 +163,7 @@ XCBConnection *XCBConnect(const char *di
     if(fd == -1)
         return 0;
 
-    XCBGetAuthInfo(fd, &auth);
+    _xcb_get_auth_info(fd, &auth);
     c = XCBConnectToFD(fd, &auth);
     free(auth.name);
     free(auth.data);
@@ -218,3 +219,8 @@ int XCBOpenUnix(const char *file)
 {
 	return _xcb_open_unix(file);
 }
+
+int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
+{
+	return _xcb_get_auth_info(fd, info);
+}
diff --git a/xcb/src/xcbint.h b/xcb/src/xcbint.h
index 7b32248..359c681 100644
--- a/xcb/src/xcbint.h
+++ b/xcb/src/xcbint.h
@@ -156,6 +156,11 @@ struct XCBConnection {
 
 int _xcb_conn_wait(XCBConnection *c, pthread_cond_t *cond, struct iovec **vector, int *count);
 
+
+/* xcb_auth.c */
+
+int _xcb_get_auth_info(int fd, XCBAuthInfo *info);
+
 #ifdef GCC_HAS_VISIBILITY
 #pragma GCC visibility pop
 #endif