SHOW:
|
|
- or go back to the newest paste.
1 | From ebc3aee7d7bf55bdbd20a82e104720de2ef98532 Mon Sep 17 00:00:00 2001 | |
2 | From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <[email protected]> | |
3 | Date: Fri, 11 Jul 2014 08:55:59 +0200 | |
4 | Subject: [PATCH 1/2] Add libnetwork to the tested libs for socket() | |
5 | ||
6 | Haiku requires this. | |
7 | --- | |
8 | configure.ac | 2 +- | |
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
10 | ||
11 | diff --git a/configure.ac b/configure.ac | |
12 | index 3a9885e..e26c137 100644 | |
13 | --- a/configure.ac | |
14 | +++ b/configure.ac | |
15 | @@ -52,7 +52,7 @@ dnl | |
16 | dnl Check for libraries | |
17 | dnl | |
18 | ||
19 | -AC_SEARCH_LIBS([socket], [socket]) | |
20 | +AC_SEARCH_LIBS([socket], [network socket]) | |
21 | AC_SEARCH_LIBS([gethostbyname], [nsl]) | |
22 | ||
23 | ||
24 | -- | |
25 | 1.8.3.4 | |
26 | ||
27 | From 3ec64b5e09d056fe476dc0110bdc11b114c25aaa Mon Sep 17 00:00:00 2001 | |
28 | From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <[email protected]> | |
29 | Date: Fri, 11 Jul 2014 08:56:49 +0200 | |
30 | Subject: [PATCH 2/2] POSIX says fd_set is defined by <sys/select.h> | |
31 | ||
32 | Haiku requires this. | |
33 | ||
34 | cf. | |
35 | http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/select.h.html | |
36 | --- | |
37 | src/socket.c | 1 + | |
38 | src/sync.c | 1 + | |
39 | 2 files changed, 2 insertions(+) | |
40 | ||
41 | diff --git a/src/socket.c b/src/socket.c | |
42 | index f76510c..2aa5f7f 100644 | |
43 | --- a/src/socket.c | |
44 | +++ b/src/socket.c | |
45 | @@ -43,6 +43,7 @@ | |
46 | #else | |
47 | # include <netinet/in.h> | |
48 | # include <arpa/inet.h> | |
49 | +# include <sys/select.h> | |
50 | # include <sys/socket.h> | |
51 | # include <netdb.h> | |
52 | # include <sys/un.h> | |
53 | diff --git a/src/sync.c b/src/sync.c | |
54 | index 43cfe50..23f7034 100644 | |
55 | --- a/src/sync.c | |
56 | +++ b/src/sync.c | |
57 | @@ -33,6 +33,7 @@ | |
58 | #include <assert.h> | |
59 | #include <stdlib.h> | |
60 | #include <stdio.h> | |
61 | +#include <sys/select.h> | |
62 | #include <fcntl.h> | |
63 | #include <unistd.h> | |
64 | ||
65 | -- | |
66 | 1.8.3.4 | |
67 | ||
68 | From 8aeca1bdc08f12081fe26ae56374c13dd399391f Mon Sep 17 00:00:00 2001 | |
69 | From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <[email protected]> | |
70 | Date: Sat, 12 Jul 2014 20:27:02 +0200 | |
71 | Subject: [PATCH 3/3] Guard sys/select.h by ifndef WIN32 | |
72 | ||
73 | Mingw32 doesn't provide it. | |
74 | ||
75 | We'll avoid a configure check just for this. | |
76 | --- | |
77 | src/sync.c | 2 ++ | |
78 | 1 file changed, 2 insertions(+) | |
79 | ||
80 | diff --git a/src/sync.c b/src/sync.c | |
81 | index 23f7034..0a6c9d3 100644 | |
82 | --- a/src/sync.c | |
83 | +++ b/src/sync.c | |
84 | @@ -33,7 +33,9 @@ | |
85 | #include <assert.h> | |
86 | #include <stdlib.h> | |
87 | #include <stdio.h> | |
88 | +#ifndef WIN32 | |
89 | #include <sys/select.h> | |
90 | +#endif | |
91 | #include <fcntl.h> | |
92 | #include <unistd.h> | |
93 | ||
94 | -- | |
95 | 1.8.3.4 |