projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define _xcb_map_new with explicit void arg list instead of empty one
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
6991238
..
7f9ab28
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-54,7
+54,6
@@
enum lazy_reply_tag
#define XCB_PAD(i) (-(i) & 3)
#define XCB_SEQUENCE_COMPARE(a,op,b) ((int64_t) ((a) - (b)) op 0)
#define XCB_PAD(i) (-(i) & 3)
#define XCB_SEQUENCE_COMPARE(a,op,b) ((int64_t) ((a) - (b)) op 0)
-#define XCB_SEQUENCE_COMPARE_32(a,op,b) (((int) (a) - (int) (b)) op 0)
#ifndef offsetof
#define offsetof(type,member) ((size_t) &((type *)0)->member)
#ifndef offsetof
#define offsetof(type,member) ((size_t) &((type *)0)->member)
@@
-80,14
+79,15
@@
void *_xcb_map_remove(_xcb_map *q, unsigned int key);
/* xcb_out.c */
/* xcb_out.c */
+typedef void (*xcb_return_socket_func_t)(void *closure);
+
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
- pthread_cond_t socket_cond;
- void (*return_socket)(void *closure);
+ xcb_return_socket_func_t return_socket;
void *socket_closure;
void *socket_closure;
-
int socket_moving
;
+
unsigned int socket_seq
;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;
@@
-107,6
+107,7
@@
int _xcb_out_init(_xcb_out *out);
void _xcb_out_destroy(_xcb_out *out);
int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count);
void _xcb_out_destroy(_xcb_out *out);
int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count);
+void _xcb_out_send_sync(xcb_connection_t *c);
int _xcb_out_flush_to(xcb_connection_t *c, uint64_t request);
int _xcb_out_flush_to(xcb_connection_t *c, uint64_t request);
@@
-174,8
+175,6
@@
void _xcb_ext_destroy(xcb_connection_t *c);
/* xcb_conn.c */
/* xcb_conn.c */
-extern const int error_connection;
-
struct xcb_connection_t {
int has_error;
struct xcb_connection_t {
int has_error;
@@
-193,7
+192,10
@@
struct xcb_connection_t {
_xcb_xid xid;
};
_xcb_xid xid;
};
-void _xcb_conn_shutdown(xcb_connection_t *c);
+void _xcb_conn_shutdown(xcb_connection_t *c, int err);
+
+xcb_connection_t *_xcb_conn_ret_error(int err);
+
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);