diff options
Diffstat (limited to 'src/pulse')
-rw-r--r-- | src/pulse/context.c | 6 | ||||
-rw-r--r-- | src/pulse/mainloop.c | 2 | ||||
-rw-r--r-- | src/pulse/timeval.c | 1 | ||||
-rw-r--r-- | src/pulse/util.c | 16 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 7a539b4d..ca816507 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -39,9 +39,6 @@ #include <sys/wait.h> #endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -57,9 +54,7 @@ #include <pulse/mainloop.h> #include <pulse/timeval.h> -#include <pulsecore/winsock.h> #include <pulsecore/core-error.h> - #include <pulsecore/native-common.h> #include <pulsecore/pdispatch.h> #include <pulsecore/pstream.h> @@ -69,6 +64,7 @@ #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> #include <pulsecore/log.h> +#include <pulsecore/socket.h> #include <pulsecore/socket-util.h> #include <pulsecore/creds.h> #include <pulsecore/macro.h> diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c index 8f743ec7..8c261381 100644 --- a/src/pulse/mainloop.c +++ b/src/pulse/mainloop.c @@ -47,7 +47,7 @@ #include <pulsecore/llist.h> #include <pulsecore/log.h> #include <pulsecore/core-error.h> -#include <pulsecore/winsock.h> +#include <pulsecore/socket.h> #include <pulsecore/macro.h> #include "mainloop.h" diff --git a/src/pulse/timeval.c b/src/pulse/timeval.c index cde4417c..c4a08419 100644 --- a/src/pulse/timeval.c +++ b/src/pulse/timeval.c @@ -31,7 +31,6 @@ #include <windows.h> #endif -#include <pulsecore/winsock.h> #include <pulsecore/macro.h> #include <pulsecore/core-util.h> 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 |