projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track 64-bit sequence numbers internally.
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
a8e167c
..
8c6bcaa
100644
(file)
--- a/
src/xcbint.h
+++ b/
src/xcbint.h
@@
-52,7
+52,8
@@
enum lazy_reply_tag
#define XCB_PAD(i) (-(i) & 3)
#define XCB_PAD(i) (-(i) & 3)
-#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0)
+#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)
/* xcb_list.c */
/* xcb_list.c */
@@
-72,11
+73,11
@@
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;
int queue_len;
- u
nsigned in
t request;
- u
nsigned in
t request_written;
+ u
int64_
t request;
+ u
int64_
t request_written;
pthread_mutex_t reqlenlock;
enum lazy_reply_tag maximum_request_length_tag;
pthread_mutex_t reqlenlock;
enum lazy_reply_tag maximum_request_length_tag;
@@
-90,7
+91,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);
-int _xcb_out_flush_to(xcb_connection_t *c, u
nsigned in
t request);
+int _xcb_out_flush_to(xcb_connection_t *c, u
int64_
t request);
/* xcb_in.c */
/* xcb_in.c */
@@
-102,9
+103,9
@@
typedef struct _xcb_in {
char queue[4096];
int queue_len;
char queue[4096];
int queue_len;
- u
nsigned in
t request_expected;
- u
nsigned in
t request_read;
- u
nsigned in
t request_completed;
+ u
int64_
t request_expected;
+ u
int64_
t request_read;
+ u
int64_
t request_completed;
struct reply_list *current_reply;
struct reply_list **current_reply_tail;
struct reply_list *current_reply;
struct reply_list **current_reply_tail;
@@
-120,21
+121,12
@@
typedef struct _xcb_in {
int _xcb_in_init(_xcb_in *in);
void _xcb_in_destroy(_xcb_in *in);
int _xcb_in_init(_xcb_in *in);
void _xcb_in_destroy(_xcb_in *in);
-int _xcb_in_expect_reply(xcb_connection_t *c, u
nsigned in
t request, enum workarounds workaround, int flags);
+int _xcb_in_expect_reply(xcb_connection_t *c, u
int64_
t request, enum workarounds workaround, int flags);
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(xcb_connection_t *c);
int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread);
-/* xcb_xlib.c */
-
-typedef struct _xcb_xlib {
- int lock;
- pthread_t thread;
- pthread_cond_t cond;
-} _xcb_xlib;
-
-
/* xcb_xid.c */
typedef struct _xcb_xid {
/* xcb_xid.c */
typedef struct _xcb_xid {
@@
-172,7
+164,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;
@@
-193,10
+184,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