projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generator: _c_accessor_get_length: remove buggy special case
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
e122f2f
..
f89deba
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-34,10
+34,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#if HAVE_SENDMSG
-#include <sys/socket.h>
-#endif
-
#ifdef GCC_HAS_VISIBILITY
#pragma GCC visibility push(hidden)
#endif
#ifdef GCC_HAS_VISIBILITY
#pragma GCC visibility push(hidden)
#endif
@@
-57,7
+53,7
@@
enum lazy_reply_tag
#define XCB_PAD(i) (-(i) & 3)
#define XCB_PAD(i) (-(i) & 3)
-#define XCB_SEQUENCE_COMPARE(a,op,b) ((int64_t) ((a) - (b)) op 0)
+#define XCB_SEQUENCE_COMPARE(a,op,b)
((int64_t) ((a) - (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)
@@
-83,13
+79,10
@@
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);
-
#if HAVE_SENDMSG
#if HAVE_SENDMSG
-#define XCB_MAX_PASS_FD
16
+#define XCB_MAX_PASS_FD 16
typedef struct _xcb_fd {
typedef struct _xcb_fd {
- struct cmsghdr cmsghdr;
int fd[XCB_MAX_PASS_FD];
int nfd;
int ifd;
int fd[XCB_MAX_PASS_FD];
int nfd;
int ifd;
@@
-100,9
+93,10
@@
typedef struct _xcb_out {
pthread_cond_t cond;
int writing;
pthread_cond_t cond;
int writing;
- xcb_return_socket_func_t return_socket;
+ pthread_cond_t socket_cond;
+ void (*return_socket)(void *closure);
void *socket_closure;
void *socket_closure;
-
unsigned int socket_seq
;
+
int socket_moving
;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;
char queue[XCB_QUEUE_BUFFER_SIZE];
int queue_len;
@@
-198,6
+192,7
@@
void _xcb_ext_destroy(xcb_connection_t *c);
/* xcb_conn.c */
struct xcb_connection_t {
/* xcb_conn.c */
struct xcb_connection_t {
+ /* This must be the first field; see _xcb_conn_ret_error(). */
int has_error;
/* constant data */
int has_error;
/* constant data */