Move xmalloc to the public side (libpolyp).

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

src/Makefile.am

@@ -273,10 +273,10 @@ mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 memblockq_test_SOURCES = \
 	tests/memblockq-test.c \
+	polyp/xmalloc.c \
 	polypcore/memblockq.c \
 	polypcore/log.c \
 	polypcore/memblock.c \
-	polypcore/xmalloc.c \
 	polypcore/util.c \
 	polypcore/mcalign.c \
 	polypcore/memchunk.c
@@ -313,7 +313,8 @@ polypinclude_HEADERS = \
 		polyp/subscribe.h \
 		polyp/version.h \
 		polyp/sample.h \
-		polyp/volume.h
+		polyp/volume.h \
+		polyp/xmalloc.h
 
 if HAVE_HOWL
 polypinclude_HEADERS += \
@@ -360,6 +361,7 @@ libpolyp_la_SOURCES = \
 		polyp/mainloop.c polyp/mainloop.h \
 		polyp/mainloop-signal.c polyp/mainloop-signal.h \
 		polyp/thread-mainloop.c polyp/thread-mainloop.h \
+		polyp/xmalloc.c polyp/xmalloc.h \
 		polypcore/pipe.c polypcore/pipe.h \
 		polypcore/poll.c polypcore/poll.h
 
@@ -392,7 +394,6 @@ libpolyp_la_SOURCES += \
 		polypcore/tagstruct.c polypcore/tagstruct.h \
 		polypcore/util.c polypcore/util.h \
 		polypcore/winsock.h \
-		polypcore/xmalloc.c polypcore/xmalloc.h \
 		polypcore/llist.h
 
 if OS_IS_WIN32
@@ -485,8 +486,7 @@ polypcoreinclude_HEADERS = \
 		polypcore/strbuf.h \
 		polypcore/tokenizer.h \
 		polypcore/util.h \
-		polypcore/utf8.h \
-		polypcore/xmalloc.h
+		polypcore/utf8.h
 
 lib_LTLIBRARIES += libpolypcore.la
 
@@ -497,7 +497,8 @@ libpolypcore_la_SOURCES = \
 		polyp/mainloop-api.c polyp/mainloop-api.h \
 		polyp/mainloop-signal.c polyp/mainloop-signal.h \
 		polyp/sample.c polyp/sample.h \
-		polyp/volume.c polyp/volume.h
+		polyp/volume.c polyp/volume.h \
+		polyp/xmalloc.c polyp/xmalloc.h
 
 # Pure core stuff (some are shared in libpolyp though).
 libpolypcore_la_SOURCES += \
@@ -546,7 +547,6 @@ libpolypcore_la_SOURCES += \
 		polypcore/tokenizer.c polypcore/tokenizer.h \
 		polypcore/util.c polypcore/util.h \
 		polypcore/winsock.h \
-		polypcore/xmalloc.c polypcore/xmalloc.h \
 		polypcore/utf8.c polypcore/utf8.h
 
 if OS_IS_WIN32

src/daemon/cmdline.c

@@ -30,9 +30,10 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/strbuf.h>
-#include <polypcore/xmalloc.h>
 
 #include "cmdline.h"
 

src/daemon/daemon-conf.c

@@ -29,8 +29,9 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/strbuf.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/resampler.h>

src/daemon/main.c

@@ -51,6 +51,7 @@
 
 #include <polyp/mainloop.h>
 #include <polyp/mainloop-signal.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/core.h>
 #include <polypcore/memblock.h>
@@ -59,7 +60,6 @@
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/sioman.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/cli-text.h>
 #include <polypcore/pid.h>
 #include <polypcore/namereg.h>

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"

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"

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"

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"

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>
 

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>
 

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>

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>
 

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>
 

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"

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>
 

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>
 

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"

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"

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"

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"

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"

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)"

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>
 

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"

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>

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>

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"
 

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>

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>

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>

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>

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>
 

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"

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"

src/polyp/browser.c

@@ -22,7 +22,8 @@
 #include <assert.h>
 #include <howl.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 

src/polyp/channelmap.c

@@ -28,8 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
+
 #include "channelmap.h"
 
 const char *const table[] = {

src/polyp/client-conf-x11.c

@@ -29,9 +29,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/x11prop.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "client-conf-x11.h"

src/polyp/client-conf.c

@@ -29,7 +29,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/conf-parser.h>
 #include <polypcore/util.h>

src/polyp/context.c

@@ -48,6 +48,7 @@
 #include "../polypcore/winsock.h"
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
@@ -56,7 +57,6 @@
 #include <polypcore/socket-client.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/socket-util.h>
 

src/polyp/glib-mainloop.c

@@ -25,8 +25,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "glib.h"

src/polyp/glib12-mainloop.c

@@ -25,8 +25,9 @@
 
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "glib-mainloop.h"

src/polyp/mainloop-api.c

@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/gccmacro.h>
-#include <polypcore/xmalloc.h>
 
 #include "mainloop-api.h"
 

src/polyp/mainloop-signal.c

@@ -36,8 +36,9 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/gccmacro.h>
 

src/polyp/mainloop.c

@@ -44,9 +44,10 @@
 #include "../polypcore/pipe.h"
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "mainloop.h"

src/polyp/operation.c

@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "internal.h"
 #include "operation.h"

src/polyp/simple.c

@@ -30,9 +30,9 @@
 
 #include <polyp/polypaudio.h>
 #include <polyp/thread-mainloop.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "simple.h"

src/polyp/stream.c

@@ -29,7 +29,8 @@
 #include <string.h>
 
 #include <polyp/def.h>
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>

src/polyp/thread-mainloop.c

@@ -41,8 +41,9 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/hashmap.h>
 
 #include "mainloop.h"

src/polypcore/authkey-prop.c

@@ -22,7 +22,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/props.h>
 #include <polypcore/log.h>
 

src/polypcore/autoload.c

@@ -27,8 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/memchunk.h>
 #include <polypcore/sound-file.h>
 #include <polypcore/log.h>

src/polypcore/cli-command.c

@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -44,7 +46,6 @@
 #include <polypcore/sound-file.h>
 #include <polypcore/play-memchunk.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/sound-file-stream.h>
 #include <polypcore/props.h>
 #include <polypcore/util.h>

src/polypcore/cli-text.c

@@ -27,6 +27,8 @@
 #include <string.h>
 
 #include <polyp/volume.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/client.h>
 #include <polypcore/sink.h>
@@ -37,7 +39,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 
 #include "cli-text.h"
 

src/polypcore/cli.c

@@ -28,6 +28,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/ioline.h>
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
@@ -40,7 +42,6 @@
 #include <polypcore/namereg.h>
 #include <polypcore/cli-text.h>
 #include <polypcore/cli-command.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "cli.h"

src/polypcore/client.c

@@ -28,7 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 

src/polypcore/conf-parser.c

@@ -28,9 +28,10 @@
 #include <stdio.h>
 #include <errno.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 
 #include "conf-parser.h"
 

src/polypcore/core-scache.c

@@ -44,10 +44,11 @@
 #include <polyp/mainloop.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/play-memchunk.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sound-file.h>

src/polypcore/core-subscribe.c

@@ -26,8 +26,9 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/queue.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "core-subscribe.h"

src/polypcore/core.c

@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <signal.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/module.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
@@ -35,7 +37,6 @@
 #include <polypcore/util.h>
 #include <polypcore/core-scache.h>
 #include <polypcore/autoload.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/props.h>
 #include <polypcore/random.h>

src/polypcore/dynarray.c

@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "dynarray.h"
 

src/polypcore/hashmap.c

@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/idxset.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "hashmap.h"

src/polypcore/idxset.c

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "idxset.h"
 

src/polypcore/iochannel.c

@@ -38,9 +38,10 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/socket-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "iochannel.h"

src/polypcore/ioline.c

@@ -29,7 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "ioline.h"

src/polypcore/log.c

@@ -33,7 +33,8 @@
 #include <syslog.h>
 #endif
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 
 #include "log.h"

src/polypcore/mcalign.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "mcalign.h"
 

src/polypcore/memblock.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "memblock.h"
 

src/polypcore/memblockq.c

@@ -30,7 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 #include <polypcore/mcalign.h>
 

src/polypcore/memchunk.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "memchunk.h"
 

src/polypcore/modargs.c

@@ -28,13 +28,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/hashmap.h>
 #include <polypcore/idxset.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/namereg.h>
 #include <polypcore/sink.h>
 #include <polypcore/source.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 
 #include "modargs.h"

src/polypcore/modinfo.c

@@ -26,7 +26,8 @@
 #include <ltdl.h>
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 

src/polypcore/module.c

@@ -30,7 +30,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>

src/polypcore/namereg.c

@@ -29,10 +29,11 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/autoload.h>
 #include <polypcore/source.h>
 #include <polypcore/sink.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/util.h>
 

src/polypcore/packet.c

@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "packet.h"
 

src/polypcore/parseaddr.c

@@ -27,7 +27,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 
 #include "parseaddr.h"

src/polypcore/pdispatch.c

@@ -27,8 +27,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/native-common.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/llist.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>

src/polypcore/pid.c

@@ -39,9 +39,10 @@
 #include <windows.h>
 #endif
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/xmalloc.h>
 
 #include "pid.h"
 

src/polypcore/play-memchunk.c

@@ -28,8 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
 
 #include "play-memchunk.h"

src/polypcore/props.c

@@ -21,7 +21,8 @@
 
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/log.h>
 
 #include "props.h"

src/polypcore/protocol-cli.c

@@ -26,8 +26,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/cli.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "protocol-cli.h"

src/polypcore/protocol-esound.c

@@ -31,6 +31,8 @@
 #include <limits.h>
 
 #include <polyp/sample.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/esound.h>
 #include <polypcore/memblock.h>
 #include <polypcore/client.h>
@@ -42,7 +44,6 @@
 #include <polypcore/sample-util.h>
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
 #include <polypcore/utf8.h>

src/polypcore/protocol-http.c

@@ -28,8 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/ioline.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/namereg.h>
 #include <polypcore/cli-text.h>

src/polypcore/protocol-native.c

@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 #include <polyp/version.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/native-common.h>
 #include <polypcore/packet.h>
@@ -43,7 +44,6 @@
 #include <polypcore/authkey.h>
 #include <polypcore/namereg.h>
 #include <polypcore/core-scache.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>

src/polypcore/protocol-simple.c

@@ -30,12 +30,13 @@
 #include <errno.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
 #include <polypcore/source-output.h>
 #include <polypcore/client.h>
 #include <polypcore/sample-util.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "protocol-simple.h"

src/polypcore/pstream.c

@@ -34,8 +34,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/queue.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/core-scache.h>
 

src/polypcore/queue.c

@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "queue.h"
 

src/polypcore/resampler.c

@@ -30,8 +30,9 @@
 #include <liboil/liboilfuncs.h>
 #include <liboil/liboil.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sconv.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "resampler.h"

src/polypcore/sink-input.c

@@ -28,8 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>

src/polypcore/sink.c

@@ -29,12 +29,12 @@
 #include <stdio.h>
 
 #include <polyp/introspect.h>
+#include <polyp/xmalloc.h>
 
 #include <polypcore/sink-input.h>
 #include <polypcore/namereg.h>
 #include <polypcore/util.h>
 #include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>

src/polypcore/socket-client.c

@@ -54,9 +54,10 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/socket-util.h>
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/parseaddr.h>
 

src/polypcore/socket-server.c

@@ -62,8 +62,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/socket-util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 

src/polypcore/socket-util.c

@@ -59,8 +59,9 @@
 
 #include "winsock.h"
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/util.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "socket-util.h"

src/polypcore/sound-file-stream.c

@@ -30,8 +30,9 @@
 
 #include <sndfile.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/sink-input.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
 #include "sound-file-stream.h"

src/polypcore/source-output.c

@@ -28,7 +28,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/utf8.h>

src/polypcore/source.c

@@ -28,9 +28,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/source-output.h>
 #include <polypcore/namereg.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/sample-util.h>

src/polypcore/strbuf.c

@@ -30,7 +30,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "strbuf.h"
 

src/polypcore/strlist.c

@@ -26,7 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
+
 #include <polypcore/strbuf.h>
 #include <polypcore/util.h>
 

src/polypcore/tagstruct.c

@@ -36,7 +36,7 @@
 
 #include "winsock.h"
 
-#include <polypcore/xmalloc.h>
+#include <polyp/xmalloc.h>
 
 #include "tagstruct.h"
 

src/polypcore/tokenizer.c

@@ -27,8 +27,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <polyp/xmalloc.h>
+
 #include <polypcore/dynarray.h>
-#include <polypcore/xmalloc.h>
 #include <polypcore/gccmacro.h>
 
 #include "tokenizer.h"