From c47e937011f00eebab7230cedb58fd59f16487b4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 May 2006 20:09:57 +0000
Subject: split polypcore/util.[ch] into polypcore/core-util.[ch] and
 polyp/util.[ch]

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@917 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/module-alsa-sink.c              | 2 +-
 src/modules/module-alsa-source.c            | 2 +-
 src/modules/module-combine.c                | 2 +-
 src/modules/module-detect.c                 | 2 +-
 src/modules/module-esound-compat-spawnfd.c  | 2 +-
 src/modules/module-esound-compat-spawnpid.c | 2 +-
 src/modules/module-esound-sink.c            | 2 +-
 src/modules/module-jack-sink.c              | 2 +-
 src/modules/module-jack-source.c            | 2 +-
 src/modules/module-match.c                  | 4 ++--
 src/modules/module-mmkbd-evdev.c            | 2 +-
 src/modules/module-null-sink.c              | 2 +-
 src/modules/module-oss-mmap.c               | 2 +-
 src/modules/module-oss.c                    | 2 +-
 src/modules/module-pipe-sink.c              | 2 +-
 src/modules/module-pipe-source.c            | 2 +-
 src/modules/module-protocol-stub.c          | 2 +-
 src/modules/module-solaris.c                | 2 +-
 src/modules/module-tunnel.c                 | 2 +-
 src/modules/module-volume-restore.c         | 4 ++--
 src/modules/module-waveout.c                | 2 +-
 src/modules/module-x11-publish.c            | 2 +-
 src/modules/module-zeroconf-publish.c       | 2 +-
 src/modules/oss-util.c                      | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 94de771c..e768e16a 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -41,7 +41,7 @@
 #include <polypcore/memchunk.h>
 #include <polypcore/sink.h>
 #include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index b9d1ff87..654f3e49 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -41,7 +41,7 @@
 #include <polypcore/memchunk.h>
 #include <polypcore/sink.h>
 #include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index b31fe56e..5047fc30 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -34,7 +34,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>
 
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index ea14e68f..2edbea5e 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -38,7 +38,7 @@
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "module-detect-symdef.h"
 
diff --git a/src/modules/module-esound-compat-spawnfd.c b/src/modules/module-esound-compat-spawnfd.c
index 9b72448f..bf89ca70 100644
--- a/src/modules/module-esound-compat-spawnfd.c
+++ b/src/modules/module-esound-compat-spawnfd.c
@@ -30,7 +30,7 @@
 
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "module-esound-compat-spawnfd-symdef.h"
diff --git a/src/modules/module-esound-compat-spawnpid.c b/src/modules/module-esound-compat-spawnpid.c
index f8c07d31..895abec3 100644
--- a/src/modules/module-esound-compat-spawnpid.c
+++ b/src/modules/module-esound-compat-spawnpid.c
@@ -29,7 +29,7 @@
 #include <signal.h>
 
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 1d61e01b..cf3ce807 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -38,7 +38,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/socket-client.h>
diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index 1aa73495..96db837a 100644
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -41,7 +41,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polyp/mainloop-api.h>
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index 29c46d85..3d783145 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -41,7 +41,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polyp/mainloop-api.h>
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 1692b5d8..c7ca12a5 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -35,12 +35,12 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/sink-input.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "module-match-symdef.h"
 
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 654fbaa4..55f0b2c8 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -40,7 +40,7 @@
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
 #include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 
 #include "module-mmkbd-evdev-symdef.h"
 
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 2cc49063..78850011 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -38,7 +38,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index 82e7d66d..a1b40389 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -43,7 +43,7 @@
 #include <polypcore/source.h>
 #include <polypcore/module.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 46d100f1..9233420d 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -42,7 +42,7 @@
 #include <polypcore/source.h>
 #include <polypcore/module.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index b59808fc..6492ba6a 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -38,7 +38,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 4f3f9a6c..9f755440 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -38,7 +38,7 @@
 #include <polypcore/iochannel.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 79a59cd5..cfe661a3 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -47,7 +47,7 @@
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>
 #include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/native-common.h>
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index d82e3362..77eb4e49 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -48,7 +48,7 @@
 #include <polypcore/source.h>
 #include <polypcore/module.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index a2a1e33d..81c32287 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -35,7 +35,7 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index ea40d862..e74567bc 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -35,12 +35,12 @@
 #include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/sink-input.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polyp/volume.h>
 
 #include "module-volume-restore-symdef.h"
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 3d1f1b01..ce9ea84d 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -36,7 +36,7 @@
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "module-waveout-symdef.h"
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index e974487d..eddcb3b8 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -41,7 +41,7 @@
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/x11wrap.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/native-common.h>
 #include <polypcore/authkey-prop.h>
 #include <polypcore/authkey.h>
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index e5dce755..5c5db286 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -35,7 +35,7 @@
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/native-common.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/dynarray.h>
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 2c573b2f..a84276f1 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
 #include <polypcore/log.h>
 
 #include "oss-util.h"
-- 
cgit