projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove libxcb-xlib and xcbxlib.h.
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
ab692ee
..
909f043
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-72,7
+72,7
@@
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
pthread_cond_t cond;
int writing;
- char queue[
4096
];
+ char queue[
XCB_QUEUE_BUFFER_SIZE
];
int queue_len;
unsigned int request;
int queue_len;
unsigned int request;
@@
-126,16
+126,6
@@
int _xcb_in_read(xcb_connection_t *c);
int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread);
int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread);
-/* xcb_xlib.c */
-
-typedef struct _xcb_xlib {
- int lock;
- int sloppy_lock;
- pthread_t thread;
- pthread_cond_t cond;
-} _xcb_xlib;
-
-
/* xcb_xid.c */
typedef struct _xcb_xid {
/* xcb_xid.c */
typedef struct _xcb_xid {
@@
-173,7
+163,6
@@
struct xcb_connection_t {
/* I/O data */
pthread_mutex_t iolock;
/* I/O data */
pthread_mutex_t iolock;
- _xcb_xlib xlib;
_xcb_in in;
_xcb_out out;
_xcb_in in;
_xcb_out out;
@@
-183,6
+172,9
@@
struct xcb_connection_t {
};
void _xcb_conn_shutdown(xcb_connection_t *c);
};
void _xcb_conn_shutdown(xcb_connection_t *c);
+void _xcb_lock_io(xcb_connection_t *c);
+void _xcb_unlock_io(xcb_connection_t *c);
+void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond);
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count);
int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count);
@@
-194,10
+186,4
@@
int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display);
#pragma GCC visibility pop
#endif
#pragma GCC visibility pop
#endif
-
-/* xcb_conn.c symbols visible to xcb-xlib */
-
-void _xcb_lock_io(xcb_connection_t *c);
-void _xcb_unlock_io(xcb_connection_t *c);
-
#endif
#endif