diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-01-04 17:03:13 +0100 |
---|---|---|
committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-02-17 11:58:21 +0100 |
commit | 4f1d4044f8409ff29eeb7f97324daba496e40714 (patch) | |
tree | 2a839bd94d128175e99a91e3a15b7cb6a18de298 /src/pulse/util.c | |
parent | d6d9fb295d03a411974a148e469465e0f7c59891 (diff) |
Use <pulsecore/socket.h> instead of <sys/socket.h>
The check whether POSIX socket.h or WIN32 winsock2.h must be included can be
made centrally. The downside is that some functionality of e.g. arpa/inet.h is
also implemented in winsock.h, so that some files that don't use socket
functions, but do use inet.h functions, must also include pulsecore/socket.h.
(as well as arpa/inet.h)
Diffstat (limited to 'src/pulse/util.c')
-rw-r--r-- | src/pulse/util.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/pulse/util.c b/src/pulse/util.c index ca766dab..3206e94c 100644 --- a/src/pulse/util.c +++ b/src/pulse/util.c @@ -37,10 +37,6 @@ #include <pwd.h> #endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - #ifdef HAVE_NETDB_H #include <netdb.h> #endif @@ -56,7 +52,7 @@ #include <pulse/xmalloc.h> #include <pulse/timeval.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/core-error.h> #include <pulsecore/log.h> #include <pulsecore/core-util.h> @@ -195,11 +191,11 @@ char *pa_get_binary_name(char *s, size_t l) { { char *rp; - if ((rp = pa_readlink("/proc/curproc/file"))) { - pa_strlcpy(s, pa_path_get_filename(rp), l); - pa_xfree(rp); - return s; - } + if ((rp = pa_readlink("/proc/curproc/file"))) { + pa_strlcpy(s, pa_path_get_filename(rp), l); + pa_xfree(rp); + return s; + } } #endif |