From 5eda18bf608a325c136a450e58fa154eb0b270f4 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 17 Feb 2006 12:10:58 +0000
Subject: Cleaned up the includes after the restructuring. Indicate which
 headers are public and which are internal through <> vs "".

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@500 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/howl-wrap.c               | 7 ++++---
 src/modules/howl-wrap.h               | 2 +-
 src/modules/module-alsa-sink.c        | 2 +-
 src/modules/module-alsa-source.c      | 2 +-
 src/modules/module-oss.c              | 2 +-
 src/modules/module-protocol-stub.c    | 2 +-
 src/modules/module-zeroconf-publish.c | 8 +++++---
 7 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c
index 77d096ac..b3acde55 100644
--- a/src/modules/howl-wrap.c
+++ b/src/modules/howl-wrap.c
@@ -21,10 +21,11 @@
 
 #include <assert.h>
 
+#include <polypcore/log.h>
+#include <polypcore/xmalloc.h>
+#include <polypcore/props.h>
+
 #include "howl-wrap.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "props.h"
 
 #define HOWL_PROPERTY "howl"
 
diff --git a/src/modules/howl-wrap.h b/src/modules/howl-wrap.h
index a670b082..42c26ef2 100644
--- a/src/modules/howl-wrap.h
+++ b/src/modules/howl-wrap.h
@@ -24,7 +24,7 @@
 
 #include <howl.h>
 
-#include "core.h"
+#include <polypcore/core.h>
 
 pa_howl_wrapper;
 
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index d3fe71a5..6ea1e137 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-sink-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Sink")
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 9453f846..4f281aa7 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -44,8 +44,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-alsa-source-symdef.h"
 #include "alsa-util.h"
+#include "module-alsa-source-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("ALSA Source")
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 264e8792..fe43c45e 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -45,8 +45,8 @@
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 
-#include "module-oss-symdef.h"
 #include "oss-util.h"
+#include "module-oss-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("OSS Sink/Source")
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 469ddcee..b69716cc 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 #endif
 
-#include <polypcore/winsock.h>
+#include "../polypcore/winsock.h"
 
 #include <polypcore/module.h>
 #include <polypcore/socket-server.h>
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index 45d566ae..d2858aac 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <polypcore/howl-wrap.h>
 #include <polypcore/xmalloc.h>
 #include <polypcore/autoload.h>
 #include <polypcore/sink.h>
@@ -37,11 +36,14 @@
 #include <polypcore/native-common.h>
 #include <polypcore/util.h>
 #include <polypcore/log.h>
-#include <polypcore/subscribe.h>
+#include <polypcore/core-subscribe.h>
 #include <polypcore/dynarray.h>
-#include <polypcore/endianmacros.h>
 #include <polypcore/modargs.h>
 
+#include "../polypcore/endianmacros.h"
+
+#include "howl-wrap.h"
+
 #include "module-zeroconf-publish-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
-- 
cgit