From 53a285e75616281bcdd8b1dcf0e3b7ba59257516 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 May 2006 20:44:55 +0000
Subject: [PATCH] fix include line for "core-util.h"

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@923 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/daemon/cmdline.c              | 2 +-
 src/daemon/cpulimit.c             | 2 +-
 src/daemon/daemon-conf.c          | 2 +-
 src/daemon/dumpmodules.c          | 2 +-
 src/daemon/main.c                 | 2 +-
 src/modules/rtp/module-rtp-recv.c | 2 +-
 src/modules/rtp/module-rtp-send.c | 2 +-
 src/modules/rtp/sap.c             | 2 +-
 src/modules/rtp/sdp.c             | 2 +-
 src/polyp/browser.c               | 2 +-
 src/polyp/channelmap.c            | 3 +--
 src/polyp/client-conf-x11.c       | 2 +-
 src/polyp/client-conf.c           | 2 +-
 src/polyp/context.c               | 2 +-
 src/polyp/glib-mainloop.c         | 2 +-
 src/polyp/glib12-mainloop.c       | 2 +-
 src/polyp/mainloop-signal.c       | 2 +-
 src/polyp/mainloop.c              | 2 +-
 src/polyp/stream.c                | 2 +-
 src/polyp/xmalloc.c               | 2 +-
 src/polypcore/ioline.h            | 2 +-
 src/tests/mainloop-test.c         | 2 +-
 src/tests/mcalign-test.c          | 2 +-
 src/tests/thread-mainloop-test.c  | 2 +-
 src/utils/pacat.c                 | 1 -
 src/utils/pacmd.c                 | 2 +-
 src/utils/pax11publish.c          | 2 +-
 27 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 1ed16a692..21fd5a257 100644
--- 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 54f111da8..699733847 100644
--- 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 f82d3d24f..0f4fcb976 100644
--- 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 c541c1681..b6a3bb7cf 100644
--- 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 a7144eba0..9b9ea1800 100644
--- 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 89aa89830..a1196a2d3 100644
--- 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 8fc1d7fee..a88ea76af 100644
--- 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 e579b5c57..5b8f31fba 100644
--- 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 3cece7110..5ec5090d6 100644
--- 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 5442fd4c0..69760d8d0 100644
--- 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 ddd7b3ce7..653331ba1 100644
--- 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 17ee2d6ae..fb67df2f0 100644
--- 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 567d2ae4c..1ebcff437 100644
--- 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 3c46e2e87..a3b49d4b5 100644
--- 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 bc5df3a9b..51d437d22 100644
--- 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 7af21210f..f7459f192 100644
--- 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 a225f78be..c57437b6e 100644
--- 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 82e789c54..8f44c180c 100644
--- 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 f188e7885..ad6c9e43c 100644
--- 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 1deeebd80..ffc7f7c81 100644
--- 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 e2dadf557..77bf87616 100644
--- 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 f62c96939..300884839 100644
--- 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 2728def22..765dcf943 100644
--- 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 8ca3f92fa..676b8d37e 100644
--- 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 51b3a48ed..b1f5bf59a 100644
--- 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 e640ddaf0..fefe76349 100644
--- 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 e43588949..ee0cb8452 100644
--- 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>