fix include line for "core-util.h"

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@923 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 1ed16a69288430f3718d27bd6741c146c575764f..21fd5a257cc39ba89a60677f9ada933112e269e1 100644 (file)
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -32,7 +32,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/strbuf.h>
 
 #include "cmdline.h"

diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c
index 54f111da82ef63e8595d39dc56dfdcf7e3b1d17f..699733847c2af5dee63b2e95d7f51ef0d7d04af0 100644 (file)
--- a/src/daemon/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "cpulimit.h"

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index f82d3d24f2211c9c3b39677f90cfaea785778e9d..0f4fcb9761d1440b5ade0f8d8dc27956225f8cba 100644 (file)
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -31,7 +31,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>

diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index c541c1681829ac5724f20106379ea24334b00873..b6a3bb7cfd148dfe3b7a7751af600d29882b9488 100644 (file)
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -30,7 +30,7 @@
 #include <ltdl.h>
 
 #include <polypcore/modinfo.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "dumpmodules.h"
 

diff --git a/src/daemon/main.c b/src/daemon/main.c
index a7144eba09356e5a11ac3306ee395218600aa314..9b9ea180036e8de374d1b69f0f34976fe80fb511 100644 (file)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -58,7 +58,7 @@
 #include <polypcore/module.h>
 #include <polypcore/cli-command.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/sioman.h>
 #include <polypcore/cli-text.h>
 #include <polypcore/pid.h>

diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 89aa8983053eac10088f41bb6e1b1c17a3fbfbe1..a1196a2d32b758ef7d50229afbeba07fdbc56635 100644 (file)
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -39,7 +39,7 @@
 #include <polypcore/sink-input.h>
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sample-util.h>

diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 8fc1d7fee71249b7fa2e6a7e7ff61fe7123aeaa7..a88ea76af14387b7035571c7fd5fc95d35f003bf 100644 (file)
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -40,7 +40,7 @@
 #include <polypcore/source-output.h>
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 

diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index e579b5c57545b1d4336eddb8e8311be5d25e6796..5b8f31fba09455e6c6f4b3ac4d094f71ae5c34a6 100644 (file)
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -40,7 +40,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "sap.h"

diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index 3cece71101b85db09aa7e87f2911e2e1465ef060..5ec5090d6490b8789f23f1f9b9536087d24f467c 100644 (file)
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -33,7 +33,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "sdp.h"

diff --git a/src/polyp/browser.c b/src/polyp/browser.c
index 5442fd4c0da11b79128383b972603a610fe57c8b..69760d8d021318aebbd1cca51dbe8c241633abfd 100644 (file)
--- a/src/polyp/browser.c
+++ b/src/polyp/browser.c
@@ -25,7 +25,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "browser.h"
 

diff --git a/src/polyp/channelmap.c b/src/polyp/channelmap.c
index ddd7b3ce7152224e19f41f0a55223278642f4845..653331ba1176c89fbda07ea8204a56b066f02ab7 100644 (file)
--- a/src/polyp/channelmap.c
+++ b/src/polyp/channelmap.c
@@ -29,8 +29,7 @@
 #include <string.h>
 
 #include <polyp/xmalloc.h>
-
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "channelmap.h"
 

diff --git a/src/polyp/client-conf-x11.c b/src/polyp/client-conf-x11.c
index 17ee2d6aeb4216d8efdf3ed8da54f172d083d55d..fb67df2f0aeab63edba87eb8d4463f84c7dc7562 100644 (file)
--- a/src/polyp/client-conf-x11.c
+++ b/src/polyp/client-conf-x11.c
@@ -33,7 +33,7 @@
 
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "client-conf-x11.h"
 

diff --git a/src/polyp/client-conf.c b/src/polyp/client-conf.c
index 567d2ae4c6891c275312befda70fe0a26393ff85..1ebcff4375abc1d10b19d4951685c91380129807 100644 (file)
--- a/src/polyp/client-conf.c
+++ b/src/polyp/client-conf.c
@@ -33,7 +33,7 @@
 
 #include <polypcore/log.h>
 #include <polypcore/conf-parser.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/authkey.h>
 
 #include "client-conf.h"

diff --git a/src/polyp/context.c b/src/polyp/context.c
index 3c46e2e8703123eb7606d0bcbcdfd1522ceb05f5..a3b49d4b539ae79cfdde101ac716f5769befcb74 100644 (file)
--- a/src/polyp/context.c
+++ b/src/polyp/context.c
@@ -56,7 +56,7 @@
 #include <polypcore/dynarray.h>
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/socket-util.h>
 

diff --git a/src/polyp/glib-mainloop.c b/src/polyp/glib-mainloop.c
index bc5df3a9beec92714620c9fecfcd349327b7cbaf..51d437d22914ce76c421433ef9d5ca9ce404cdb4 100644 (file)
--- a/src/polyp/glib-mainloop.c
+++ b/src/polyp/glib-mainloop.c
@@ -28,7 +28,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/idxset.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "glib.h"
 #include "glib-mainloop.h"

diff --git a/src/polyp/glib12-mainloop.c b/src/polyp/glib12-mainloop.c
index 7af21210fa38b1fce38c6a6f6e39a888e96fa18d..f7459f192d0dedc6a9fe8e01204b737fb6663035 100644 (file)
--- a/src/polyp/glib12-mainloop.c
+++ b/src/polyp/glib12-mainloop.c
@@ -28,7 +28,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/idxset.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "glib-mainloop.h"
 

diff --git a/src/polyp/mainloop-signal.c b/src/polyp/mainloop-signal.c
index a225f78be9d5ed580fe22ed6cf1aedef08ea20b9..c57437b6edf2f7cc3695263289d932714e9dcfb6 100644 (file)
--- a/src/polyp/mainloop-signal.c
+++ b/src/polyp/mainloop-signal.c
@@ -38,7 +38,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 

diff --git a/src/polyp/mainloop.c b/src/polyp/mainloop.c
index 82e789c54b29d89d4f38b809924d2471fe9c651b..8f44c180c0ec141ac5b3c5788ee62fa66e3d49d8 100644 (file)
--- a/src/polyp/mainloop.c
+++ b/src/polyp/mainloop.c
@@ -46,7 +46,7 @@
 
 #include <polyp/xmalloc.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/idxset.h>
 #include <polypcore/log.h>
 

diff --git a/src/polyp/stream.c b/src/polyp/stream.c
index f188e788577a7a36ade40ced77d4774062d715cd..ad6c9e43cf8efdf42b8f58b1832bb5de69611c34 100644 (file)
--- a/src/polyp/stream.c
+++ b/src/polyp/stream.c
@@ -32,7 +32,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/pstream-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/hashmap.h>
 

diff --git a/src/polyp/xmalloc.c b/src/polyp/xmalloc.c
index 1deeebd80d7c598390736b88a6f5299a72495680..ffc7f7c81022b4b4b4d6a149641ee5efc3eab270 100644 (file)
--- a/src/polyp/xmalloc.c
+++ b/src/polyp/xmalloc.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/gccmacro.h>
 
 #include "xmalloc.h"

diff --git a/src/polypcore/ioline.h b/src/polypcore/ioline.h
index e2dadf557ceaf3d258d88706c5a5d43540a9eab2..77bf876161efccfe9263fe3dda3d511b16d7bfe8 100644 (file)
--- a/src/polypcore/ioline.h
+++ b/src/polypcore/ioline.h
@@ -23,7 +23,7 @@
 ***/
 
 #include <polypcore/iochannel.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 /* An ioline wraps an iochannel for line based communication. A
  * callback function is called whenever a new line has been recieved

diff --git a/src/tests/mainloop-test.c b/src/tests/mainloop-test.c
index f62c96939616842a4e0ba3db0159a8727e39ac1a..300884839424f4b1271f8bc6965b2a3a9a3d3efb 100644 (file)
--- a/src/tests/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #include <assert.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/gccmacro.h>
 
 #ifdef GLIB_MAIN_LOOP

diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 2728def2267fd69959a1a82a54026907a824da98..765dcf9438021938589d68cc14b162ee94b1d61a 100644 (file)
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/mcalign.h>
 #include <polypcore/gccmacro.h>
 

diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
index 8ca3f92fa6d24e73906c36f0149ed56ef31ddc94..676b8d37e1f769e3dc1cd3d416bd993977255ece 100644 (file)
--- a/src/tests/thread-mainloop-test.c
+++ b/src/tests/thread-mainloop-test.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include <polypcore/gccmacro.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polyp/thread-mainloop.h>
 
 static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {

diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index 51b3a48ed6d292fe866caf7b64ea65bc0a648bca..b1f5bf59a6efa54cadff66b7f0e9837d4e8bd5ce 100644 (file)
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -34,7 +34,6 @@
 #include <fcntl.h>
 
 #include <polyp/polypaudio.h>
-#include <polypcore/util.h>
 
 #define TIME_EVENT_USEC 50000
 

diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index e640ddaf077e73288e07eaee0d8e290659bede39..fefe763490f8a7880689ed53cbf985d9aaecf435 100644 (file)
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <sys/un.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/pid.h>
 

diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index e435889493922452aa16c23a3e052bf2c923e5ba..ee0cb84522d00848bbbf3382861c2cd473a656db 100644 (file)
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -31,7 +31,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/authkey.h>
 #include <polypcore/native-common.h>