projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
[free-sw/xcb/libxcb]
/
src
/
xcb_util.c
diff --git
a/src/xcb_util.c
b/src/xcb_util.c
index
b1e9327
..
343e21f
100644
(file)
--- a/
src/xcb_util.c
+++ b/
src/xcb_util.c
@@
-26,7
+26,7
@@
/* Utility functions implementable using only public APIs. */
#include <assert.h>
/* Utility functions implementable using only public APIs. */
#include <assert.h>
-#include <sys/
select
.h>
+#include <sys/
types
.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
@@
-39,6
+39,7
@@
#include "xcb.h"
#include "xcbext.h"
#include "xcb.h"
#include "xcbext.h"
+#include "xcbint.h"
int XCBPopcount(CARD32 mask)
{
int XCBPopcount(CARD32 mask)
{
@@
-161,7
+162,7
@@
XCBConnection *XCBConnect(const char *displayname, int *screenp)
if(fd == -1)
return 0;
if(fd == -1)
return 0;
-
XCBGetAuthI
nfo(fd, &auth);
+
_xcb_get_auth_i
nfo(fd, &auth);
c = XCBConnectToFD(fd, &auth);
free(auth.name);
free(auth.data);
c = XCBConnectToFD(fd, &auth);
free(auth.name);
free(auth.data);
@@
-217,3
+218,8
@@
int XCBOpenUnix(const char *file)
{
return _xcb_open_unix(file);
}
{
return _xcb_open_unix(file);
}
+
+int XCBGetAuthInfo(int fd, XCBAuthInfo *info)
+{
+ return _xcb_get_auth_info(fd, info);
+}