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/daemon/cmdline.c     | 3 ++-
 src/daemon/daemon-conf.c | 3 ++-
 src/daemon/main.c        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/daemon')

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index a6b95a81..1ed16a69 100644
--- a/src/daemon/cmdline.c
+++ b/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"
 
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index f41bb4b1..f82d3d24 100644
--- a/src/daemon/daemon-conf.c
+++ b/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>
diff --git a/src/daemon/main.c b/src/daemon/main.c
index e14837a9..a7144eba 100644
--- a/src/daemon/main.c
+++ b/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>
-- 
cgit