summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/core-util.c
diff options
context:
space:
mode:
authorMaarten Bosmans <mkbosmans@gmail.com>2011-01-04 17:03:13 +0100
committerMaarten Bosmans <mkbosmans@gmail.com>2011-02-17 11:58:21 +0100
commit4f1d4044f8409ff29eeb7f97324daba496e40714 (patch)
tree2a839bd94d128175e99a91e3a15b7cb6a18de298 /src/pulsecore/core-util.c
parentd6d9fb295d03a411974a148e469465e0f7c59891 (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/pulsecore/core-util.c')
-rw-r--r--src/pulsecore/core-util.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index ec0b338d..3ce5edbf 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -43,7 +43,6 @@
#include <regex.h>
#include <langinfo.h>
#include <sys/utsname.h>
-#include <sys/socket.h>
#ifdef HAVE_STRTOF_L
#include <locale.h>
@@ -110,7 +109,7 @@
#include <pulse/utf8.h>
#include <pulsecore/core-error.h>
-#include <pulsecore/winsock.h>
+#include <pulsecore/socket.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/thread.h>