projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix alignment issues in FD passing code
[free-sw/xcb/libxcb]
/
src
/
xcbint.h
diff --git
a/src/xcbint.h
b/src/xcbint.h
index
391a4e1
..
5c904fb
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
@@
-89,9
+85,9
@@
typedef void (*xcb_return_socket_func_t)(void *closure);
#define XCB_MAX_PASS_FD 16
typedef struct _xcb_fd {
#define XCB_MAX_PASS_FD 16
typedef struct _xcb_fd {
- struct cmsghdr cmsghdr;
int fd[XCB_MAX_PASS_FD];
int nfd;
int fd[XCB_MAX_PASS_FD];
int nfd;
+ int ifd;
} _xcb_fd;
#endif
} _xcb_fd;
#endif
@@
-150,6
+146,10
@@
typedef struct _xcb_in {
struct pending_reply *pending_replies;
struct pending_reply **pending_replies_tail;
struct pending_reply *pending_replies;
struct pending_reply **pending_replies_tail;
+#if HAVE_SENDMSG
+ _xcb_fd in_fd;
+#endif
+ struct xcb_special_event *special_events;
} _xcb_in;
int _xcb_in_init(_xcb_in *in);
} _xcb_in;
int _xcb_in_init(_xcb_in *in);