62 lines
1.7 KiB
Plaintext
62 lines
1.7 KiB
Plaintext
From 002b746f8948f0618e686b5b76b229efa55009ee Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 26 Oct 2017 14:53:57 +0200
|
|
Subject: Haiku patch
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f880918..0a19ed2 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -87,8 +87,8 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
|
|
AC_SUBST(XCBPROTO_XCBPYTHONDIR)
|
|
|
|
AC_HEADER_STDC
|
|
-AC_SEARCH_LIBS(getaddrinfo, socket)
|
|
-AC_SEARCH_LIBS(connect, socket)
|
|
+AC_SEARCH_LIBS(getaddrinfo, [network socket])
|
|
+AC_SEARCH_LIBS(connect, [network socket])
|
|
|
|
# Find support for sending a message from a socket
|
|
AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"])
|
|
diff --git a/src/xcb_util.c b/src/xcb_util.c
|
|
index a16270c..017c337 100644
|
|
--- a/src/xcb_util.c
|
|
+++ b/src/xcb_util.c
|
|
@@ -439,7 +439,7 @@ static int _xcb_open_unix(char *protocol, const char *file)
|
|
strcpy(addr.sun_path, file);
|
|
addr.sun_family = AF_UNIX;
|
|
#ifdef HAVE_SOCKADDR_SUN_LEN
|
|
- addr.sun_len = SUN_LEN(&addr);
|
|
+ addr.sun_len = sizeof(&addr);
|
|
#endif
|
|
fd = _xcb_socket(AF_UNIX, SOCK_STREAM, 0);
|
|
if(fd == -1)
|
|
--
|
|
2.14.2
|
|
|
|
|
|
From d0fe33a095851988d674431efb1abe27ae7afd53 Mon Sep 17 00:00:00 2001
|
|
From: fbrosson <fbrosson@localhost>
|
|
Date: Sun, 25 Mar 2018 17:51:15 +0000
|
|
Subject: C89 fixes for gcc2 compatibility, needed since libxcb 1.12.
|
|
|
|
|
|
diff --git a/src/xcb_out.c b/src/xcb_out.c
|
|
index 3601a5f..11a5cf7 100644
|
|
--- a/src/xcb_out.c
|
|
+++ b/src/xcb_out.c
|
|
@@ -179,7 +179,8 @@ uint32_t xcb_get_maximum_request_length(xcb_connection_t *c)
|
|
|
|
static void close_fds(int *fds, unsigned int num_fds)
|
|
{
|
|
- for (unsigned int index = 0; index < num_fds; index++)
|
|
+ unsigned int index;
|
|
+ for (index = 0; index < num_fds; index++)
|
|
close(fds[index]);
|
|
}
|
|
|
|
--
|
|
2.16.3
|
|
|