From 55f273eb008cac7c2307057aa0ce85cf297b982c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Apr 2008 17:06:41 +0000
Subject: s/pulsecore\/gccmacro.h/pulse\/gccmacro.h/

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2261 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pulse/channelmap.h         | 1 +
 src/pulse/introspect.c         | 2 +-
 src/pulse/mainloop-api.c       | 3 +--
 src/pulse/mainloop-signal.c    | 2 +-
 src/pulse/subscribe.c          | 3 ++-
 src/pulse/utf8.h               | 1 +
 src/pulse/util.h               | 1 +
 src/pulse/xmalloc.c            | 2 +-
 src/pulsecore/client.c         | 1 +
 src/pulsecore/flist.h          | 2 +-
 src/pulsecore/hook-list.h      | 5 +++--
 src/pulsecore/log.h            | 2 +-
 src/pulsecore/play-memblockq.c | 2 +-
 src/pulsecore/play-memchunk.c  | 2 +-
 src/pulsecore/sink-input.c     | 1 +
 src/pulsecore/source-output.c  | 1 +
 src/pulsecore/strbuf.h         | 2 +-
 src/pulsecore/tokenizer.c      | 2 +-
 src/utils/padsp.c              | 2 +-
 19 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h
index 4122a318..00d3eb0d 100644
--- a/src/pulse/channelmap.h
+++ b/src/pulse/channelmap.h
@@ -27,6 +27,7 @@
 
 #include <pulse/sample.h>
 #include <pulse/cdecl.h>
+#include <pulse/gccmacro.h>
 
 /** \page channelmap Channel Maps
  *
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 9c50b57b..49f93463 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -27,8 +27,8 @@
 #endif
 
 #include <pulse/context.h>
+#include <pulse/gccmacro.h>
 
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/pstream-util.h>
 
diff --git a/src/pulse/mainloop-api.c b/src/pulse/mainloop-api.c
index b2ed3434..dda51297 100644
--- a/src/pulse/mainloop-api.c
+++ b/src/pulse/mainloop-api.c
@@ -28,8 +28,8 @@
 #include <stdlib.h>
 
 #include <pulse/xmalloc.h>
+#include <pulse/gccmacro.h>
 
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/macro.h>
 
 #include "mainloop-api.h"
@@ -75,4 +75,3 @@ void pa_mainloop_api_once(pa_mainloop_api* m, void (*callback)(pa_mainloop_api *
     pa_assert_se(e = m->defer_new(m, once_callback, i));
     m->defer_set_destroy(e, free_callback);
 }
-
diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index e41ed14c..8ad465bd 100644
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -39,11 +39,11 @@
 #endif
 
 #include <pulse/xmalloc.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/macro.h>
 
 #include "mainloop-signal.h"
diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c
index 580038cc..db25f3cf 100644
--- a/src/pulse/subscribe.c
+++ b/src/pulse/subscribe.c
@@ -27,7 +27,8 @@
 
 #include <stdio.h>
 
-#include <pulsecore/gccmacro.h>
+#include <pulse/gccmacro.h>
+
 #include <pulsecore/macro.h>
 #include <pulsecore/pstream-util.h>
 
diff --git a/src/pulse/utf8.h b/src/pulse/utf8.h
index 1e08047c..840c74e0 100644
--- a/src/pulse/utf8.h
+++ b/src/pulse/utf8.h
@@ -26,6 +26,7 @@
 ***/
 
 #include <pulse/cdecl.h>
+#include <pulse/gccmacro.h>
 
 /** \file
  * UTF8 Validation functions
diff --git a/src/pulse/util.h b/src/pulse/util.h
index 764678e5..666ccce4 100644
--- a/src/pulse/util.h
+++ b/src/pulse/util.h
@@ -28,6 +28,7 @@
 #include <stddef.h>
 
 #include <pulse/cdecl.h>
+#include <pulse/gccmacro.h>
 
 /** \file
  * Assorted utility functions */
diff --git a/src/pulse/xmalloc.c b/src/pulse/xmalloc.c
index 5348dda4..28490975 100644
--- a/src/pulse/xmalloc.c
+++ b/src/pulse/xmalloc.c
@@ -30,8 +30,8 @@
 #include <unistd.h>
 #include <string.h>
 
+#include <pulse/gccmacro.h>
 #include <pulsecore/core-util.h>
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/macro.h>
 
 #include "xmalloc.h"
diff --git a/src/pulsecore/client.c b/src/pulsecore/client.c
index 6a087d46..4eca4e2a 100644
--- a/src/pulsecore/client.c
+++ b/src/pulsecore/client.c
@@ -35,6 +35,7 @@
 #include <pulsecore/core-subscribe.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/core-util.h>
 
 #include "client.h"
 
diff --git a/src/pulsecore/flist.h b/src/pulsecore/flist.h
index daf0fec4..3d9a89a2 100644
--- a/src/pulsecore/flist.h
+++ b/src/pulsecore/flist.h
@@ -25,9 +25,9 @@
 ***/
 
 #include <pulse/def.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/once.h>
-#include <pulsecore/gccmacro.h>
 
 /* A multiple-reader multipler-write lock-free free list implementation */
 
diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h
index b3bd600a..c288980d 100644
--- a/src/pulsecore/hook-list.h
+++ b/src/pulsecore/hook-list.h
@@ -24,9 +24,10 @@
   USA.
 ***/
 
-#include <pulsecore/llist.h>
 #include <pulse/xmalloc.h>
-#include <pulsecore/gccmacro.h>
+#include <pulse/gccmacro.h>
+
+#include <pulsecore/llist.h>
 
 typedef struct pa_hook_slot pa_hook_slot;
 typedef struct pa_hook pa_hook;
diff --git a/src/pulsecore/log.h b/src/pulsecore/log.h
index b0711dca..765dd2e5 100644
--- a/src/pulsecore/log.h
+++ b/src/pulsecore/log.h
@@ -27,7 +27,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <pulsecore/gccmacro.h>
+#include <pulse/gccmacro.h>
 
 /* A simple logging subsystem */
 
diff --git a/src/pulsecore/play-memblockq.c b/src/pulsecore/play-memblockq.c
index bad60ae5..3d435c8b 100644
--- a/src/pulsecore/play-memblockq.c
+++ b/src/pulsecore/play-memblockq.c
@@ -30,9 +30,9 @@
 #include <string.h>
 
 #include <pulse/xmalloc.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/sink-input.h>
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/thread-mq.h>
 #include <pulsecore/sample-util.h>
 
diff --git a/src/pulsecore/play-memchunk.c b/src/pulsecore/play-memchunk.c
index c528b1d0..e4d24a99 100644
--- a/src/pulsecore/play-memchunk.c
+++ b/src/pulsecore/play-memchunk.c
@@ -30,9 +30,9 @@
 #include <string.h>
 
 #include <pulse/xmalloc.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/sink-input.h>
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/thread-mq.h>
 #include <pulsecore/play-memblockq.h>
 
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index ddd9980f..2d0ba449 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -38,6 +38,7 @@
 #include <pulsecore/log.h>
 #include <pulsecore/play-memblockq.h>
 #include <pulsecore/namereg.h>
+#include <pulsecore/core-util.h>
 
 #include "sink-input.h"
 
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index cf576ac9..c0cbb42f 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -36,6 +36,7 @@
 #include <pulsecore/core-subscribe.h>
 #include <pulsecore/log.h>
 #include <pulsecore/namereg.h>
+#include <pulsecore/core-util.h>
 
 #include "source-output.h"
 
diff --git a/src/pulsecore/strbuf.h b/src/pulsecore/strbuf.h
index 1c0850b1..d3555a2c 100644
--- a/src/pulsecore/strbuf.h
+++ b/src/pulsecore/strbuf.h
@@ -24,7 +24,7 @@
   USA.
 ***/
 
-#include <pulsecore/gccmacro.h>
+#include <pulse/gccmacro.h>
 
 typedef struct pa_strbuf pa_strbuf;
 
diff --git a/src/pulsecore/tokenizer.c b/src/pulsecore/tokenizer.c
index f79c19c5..cf5da648 100644
--- a/src/pulsecore/tokenizer.c
+++ b/src/pulsecore/tokenizer.c
@@ -29,9 +29,9 @@
 #include <stdlib.h>
 
 #include <pulse/xmalloc.h>
+#include <pulse/gccmacro.h>
 
 #include <pulsecore/dynarray.h>
-#include <pulsecore/gccmacro.h>
 #include <pulsecore/macro.h>
 
 #include "tokenizer.h"
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index d3f034d0..6ab022ee 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -53,8 +53,8 @@
 #endif
 
 #include <pulse/pulseaudio.h>
+#include <pulse/gccmacro.h>
 #include <pulsecore/llist.h>
-#include <pulsecore/gccmacro.h>
 
 /* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
 #if !defined(SIOCINQ) && defined(FIONREAD)
-- 
cgit