diff options
author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 21:15:09 +0000 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 21:15:09 +0000 |
commit | 8f3c364b4700c8e459269ff00dbe810503038639 (patch) | |
tree | 0f48877dbe58b7de8cab9bbc32b4d03e217b5342 | |
parent | e28ce8c59f193f53f1c722f3d54238e6d35de731 (diff) |
Make sure all socket headers are protected by ifdefs.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@399 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | polyp/module-protocol-stub.c | 7 | ||||
-rw-r--r-- | polyp/polyplib-context.c | 9 | ||||
-rw-r--r-- | polyp/pstream.c | 3 | ||||
-rw-r--r-- | polyp/socket-client.c | 16 | ||||
-rw-r--r-- | polyp/socket-server.c | 12 | ||||
-rw-r--r-- | polyp/socket-util.c | 24 | ||||
-rw-r--r-- | polyp/tagstruct.c | 5 | ||||
-rw-r--r-- | polyp/util.c | 3 |
9 files changed, 65 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 2d753324..8200383b 100644 --- a/configure.ac +++ b/configure.ac @@ -119,9 +119,9 @@ AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1") AC_HEADER_STDC # POSIX -AC_CHECK_HEADERS([glob.h grp.h netdb.h netinet/in.h netinet/tcp.h pwd.h \ - sched.h sys/capability.h sys/resource.h sys/select.h sys/socket.h \ - syslog.h]) +AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \ + netinet/in_systm.h netinet/ip.h netinet/tcp.h pwd.h sched.h \ + sys/capability.h sys/resource.h sys/select.h sys/socket.h syslog.h]) AC_CHECK_HEADERS([regex.h], [HAVE_REGEX=1], [HAVE_REGEX=0]) AC_CHECK_HEADERS([sys/un.h], [HAVE_AF_UNIX=1], [HAVE_AF_UNIX=0]) diff --git a/polyp/module-protocol-stub.c b/polyp/module-protocol-stub.c index 15697582..0b91c68c 100644 --- a/polyp/module-protocol-stub.c +++ b/polyp/module-protocol-stub.c @@ -27,9 +27,14 @@ #include <errno.h> #include <stdio.h> #include <assert.h> -#include <arpa/inet.h> #include <unistd.h> + +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #include "module.h" #include "socket-server.h" diff --git a/polyp/polyplib-context.c b/polyp/polyplib-context.c index f54cabbe..f85c5a41 100644 --- a/polyp/polyplib-context.c +++ b/polyp/polyplib-context.c @@ -28,14 +28,19 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> #include <unistd.h> #include <sys/stat.h> #include <errno.h> #include <sys/wait.h> #include <signal.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif + #include "polyplib-internal.h" #include "polyplib-context.h" #include "native-common.h" diff --git a/polyp/pstream.c b/polyp/pstream.c index c081c242..a64856d7 100644 --- a/polyp/pstream.c +++ b/polyp/pstream.c @@ -27,7 +27,10 @@ #include <stdlib.h> #include <assert.h> #include <unistd.h> + +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif #include "pstream.h" #include "queue.h" diff --git a/polyp/socket-client.c b/polyp/socket-client.c index 58bc7e80..0d712fa3 100644 --- a/polyp/socket-client.c +++ b/polyp/socket-client.c @@ -31,14 +31,22 @@ #include <string.h> #include <assert.h> #include <stdlib.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <netdb.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif #ifdef HAVE_LIBASYNCNS #include <asyncns.h> diff --git a/polyp/socket-server.c b/polyp/socket-server.c index ed86bc29..0cca4ae8 100644 --- a/polyp/socket-server.c +++ b/polyp/socket-server.c @@ -28,15 +28,21 @@ #include <errno.h> #include <string.h> #include <sys/types.h> -#include <sys/socket.h> #include <stdio.h> #include <unistd.h> -#include <netinet/in.h> -#include <arpa/inet.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #ifdef HAVE_LIBWRAP #include <tcpd.h> diff --git a/polyp/socket-util.c b/polyp/socket-util.c index eb6b4246..60f8d167 100644 --- a/polyp/socket-util.c +++ b/polyp/socket-util.c @@ -31,19 +31,31 @@ #include <string.h> #include <stdio.h> #include <sys/types.h> -#include <netinet/in.h> #include <fcntl.h> #include <unistd.h> -#include <netinet/in_systm.h> -#include <netinet/tcp.h> -#include <netinet/ip.h> -#include <sys/socket.h> #include <sys/stat.h> -#include <netdb.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#ifdef HAVE_NETDB_H +#include <netdb.h> +#endif #include "socket-util.h" #include "util.h" diff --git a/polyp/tagstruct.c b/polyp/tagstruct.c index a6dad868..a3bd7d99 100644 --- a/polyp/tagstruct.c +++ b/polyp/tagstruct.c @@ -27,9 +27,12 @@ #include <string.h> #include <unistd.h> #include <sys/time.h> -#include <netinet/in.h> #include <assert.h> +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + #include "tagstruct.h" #include "xmalloc.h" diff --git a/polyp/util.c b/polyp/util.c index 9e8dc5e2..67eaeda1 100644 --- a/polyp/util.c +++ b/polyp/util.c @@ -41,7 +41,10 @@ #include <sys/resource.h> #include <limits.h> #include <unistd.h> + +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif #include <samplerate.h> |