From d9cc2cfcb97c1b0449bcbfb6ab0301a58d77bd55 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 17 May 2006 16:34:18 +0000
Subject: Move xmalloc to the public side (libpolyp).

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@908 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/alsa-util.c               | 3 ++-
 src/modules/howl-wrap.c               | 3 ++-
 src/modules/module-alsa-sink.c        | 3 ++-
 src/modules/module-alsa-source.c      | 3 ++-
 src/modules/module-combine.c          | 3 ++-
 src/modules/module-detect.c           | 3 ++-
 src/modules/module-esound-sink.c      | 3 ++-
 src/modules/module-jack-sink.c        | 3 ++-
 src/modules/module-jack-source.c      | 3 ++-
 src/modules/module-lirc.c             | 3 ++-
 src/modules/module-match.c            | 3 ++-
 src/modules/module-mmkbd-evdev.c      | 3 ++-
 src/modules/module-null-sink.c        | 3 ++-
 src/modules/module-oss-mmap.c         | 3 ++-
 src/modules/module-oss.c              | 3 ++-
 src/modules/module-pipe-sink.c        | 3 ++-
 src/modules/module-pipe-source.c      | 3 ++-
 src/modules/module-protocol-stub.c    | 3 ++-
 src/modules/module-sine.c             | 3 ++-
 src/modules/module-solaris.c          | 2 +-
 src/modules/module-tunnel.c           | 2 +-
 src/modules/module-volume-restore.c   | 3 ++-
 src/modules/module-waveout.c          | 3 ++-
 src/modules/module-x11-bell.c         | 3 ++-
 src/modules/module-x11-publish.c      | 3 ++-
 src/modules/module-zeroconf-publish.c | 3 ++-
 src/modules/rtp/module-rtp-recv.c     | 3 ++-
 src/modules/rtp/module-rtp-send.c     | 3 ++-
 src/modules/rtp/sap.c                 | 3 ++-
 src/modules/rtp/sdp.c                 | 3 ++-
 30 files changed, 58 insertions(+), 30 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index 503b8efb..122f4419 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -27,7 +27,8 @@
 #include <asoundlib.h>
 
 #include <polyp/sample.h>
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c
index f4605fb2..467ab9e2 100644
--- a/src/modules/howl-wrap.c
+++ b/src/modules/howl-wrap.c
@@ -21,8 +21,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/props.h>
 
 #include "howl-wrap.h"
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 47065659..94de771c 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -34,6 +34,8 @@
 
 #include <asoundlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core.h>
 #include <polypcore/module.h>
 #include <polypcore/memchunk.h>
@@ -41,7 +43,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index d46f8e42..b9d1ff87 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -34,6 +34,8 @@
 
 #include <asoundlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core.h>
 #include <polypcore/module.h>
 #include <polypcore/memchunk.h>
@@ -41,7 +43,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "alsa-util.h"
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 369778a6..b31fe56e 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -26,6 +26,8 @@
 #include <assert.h>
 #include <stdio.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/sink.h>
@@ -33,7 +35,6 @@
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 9cc13e81..ea14e68f 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -33,9 +33,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 1cc75502..1d61e01b 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/socket-client.h>
 #include <polypcore/esound.h>
diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index 324a2cb3..1aa73495 100644
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -36,12 +36,13 @@
 
 #include <jack/jack.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.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 94cabbea..29c46d85 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -36,12 +36,13 @@
 
 #include <jack/jack.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polyp/mainloop-api.h>
 
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
index 3bb0dc74..918177a3 100644
--- a/src/modules/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -30,11 +30,12 @@
 #include <lirc/lirc_client.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/log.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 
 #include "module-lirc-symdef.h"
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 9e3edb70..1692b5d8 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -32,12 +32,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/util.h>
 
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index 8ea56811..654fbaa4 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -33,11 +33,12 @@
 
 #include <linux/input.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/log.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 #include <polypcore/util.h>
 
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 5cdfeab8..2cc49063 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-null-sink-symdef.h"
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index ddf33532..82e7d66d 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -36,6 +36,8 @@
 #include <limits.h>
 #include <sys/mman.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -43,7 +45,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "oss-util.h"
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index f6d19544..46d100f1 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -35,6 +35,8 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -42,7 +44,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "oss-util.h"
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 0fb73cd8..b59808fc 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-pipe-sink-symdef.h"
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index d999754a..4f3f9a6c 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -33,12 +33,13 @@
 #include <unistd.h>
 #include <limits.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-pipe-source-symdef.h"
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index d5b5f63b..79a59cd5 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -42,6 +42,8 @@
 
 #include "../polypcore/winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>
 #include <polypcore/socket-util.h>
@@ -49,7 +51,6 @@
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"
diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c
index 3267d49b..15b6c8a9 100644
--- a/src/modules/module-sine.c
+++ b/src/modules/module-sine.c
@@ -27,10 +27,11 @@
 #include <assert.h>
 #include <math.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
 #include <polypcore/module.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 3e7c2fb4..d82e3362 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -41,6 +41,7 @@
 #include <sys/audio.h>
 
 #include <polyp/mainloop-signal.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
@@ -49,7 +50,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "module-solaris-symdef.h"
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 2e04b120..a2a1e33d 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -32,13 +32,13 @@
 #include <stdlib.h>
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index f9e7d013..ea40d862 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -32,12 +32,13 @@
 #include <stdlib.h>
 #include <ctype.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/util.h>
 #include <polypcore/modargs.h>
 #include <polypcore/log.h>
 #include <polypcore/core-subscribe.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sink-input.h>
 #include <polypcore/util.h>
 #include <polyp/volume.h>
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 2d9c42eb..3d1f1b01 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -29,6 +29,8 @@
 
 #include <polyp/mainloop-api.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
 #include <polypcore/module.h>
@@ -36,7 +38,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "module-waveout-symdef.h"
 
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index e4d4020e..2b891bc1 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -31,11 +31,12 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/iochannel.h>
 #include <polypcore/sink.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/x11wrap.h>
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index 7408b930..e974487d 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -32,11 +32,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/namereg.h>
 #include <polypcore/log.h>
 #include <polypcore/x11wrap.h>
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index f8607bef..e5dce755 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -29,7 +29,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/autoload.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index 925a1210..89aa8983 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/sink.h>
@@ -38,7 +40,6 @@
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.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 d0def859..8fc1d7fe 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/llist.h>
 #include <polypcore/source.h>
@@ -39,7 +41,6 @@
 #include <polypcore/memblockq.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/modargs.h>
 #include <polypcore/namereg.h>
 
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index d2bca04d..e579b5c5 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -38,9 +38,10 @@
 #include <sys/filio.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "sap.h"
 #include "sdp.h"
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index 84bcd83b..3cece711 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -31,9 +31,10 @@
 #include <arpa/inet.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "sdp.h"
 #include "rtp.h"
-- 
cgit