diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-09 10:00:20 +0100 |
---|---|---|
committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-03-11 11:49:39 +0000 |
commit | b3721a12c5c31ae55141ff46af0c553d060fe363 (patch) | |
tree | dc6e254719e83de268fbd5363ed58adaa15ce7b7 /src/pulse | |
parent | ecf09f2cd6bf2f46b0d2402c700ab618c090bd4c (diff) |
Fixup #include directives according to Coding Style
Use #include "header.h" if functionality of header.h is implemented
and #include <header.h> if functionality of header.h is used.
Diffstat (limited to 'src/pulse')
-rw-r--r-- | src/pulse/browser.c | 2 | ||||
-rw-r--r-- | src/pulse/context.c | 13 | ||||
-rw-r--r-- | src/pulse/ext-device-manager.c | 5 | ||||
-rw-r--r-- | src/pulse/ext-stream-restore.c | 5 | ||||
-rw-r--r-- | src/pulse/introspect.c | 3 | ||||
-rw-r--r-- | src/pulse/scache.c | 4 | ||||
-rw-r--r-- | src/pulse/stream.c | 4 | ||||
-rw-r--r-- | src/pulse/subscribe.c | 1 |
8 files changed, 15 insertions, 22 deletions
diff --git a/src/pulse/browser.c b/src/pulse/browser.c index 4cf5d0c3..d0592284 100644 --- a/src/pulse/browser.c +++ b/src/pulse/browser.c @@ -20,7 +20,7 @@ ***/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif #include <string.h> diff --git a/src/pulse/context.c b/src/pulse/context.c index 8f632b5d..1480af53 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -53,6 +53,11 @@ #include <pulse/i18n.h> #include <pulse/mainloop.h> #include <pulse/timeval.h> +#include <pulse/fork-detect.h> +#include <pulse/client-conf.h> +#ifdef HAVE_X11 +#include <pulse/client-conf-x11.h> +#endif #include <pulsecore/core-error.h> #include <pulsecore/native-common.h> @@ -71,14 +76,6 @@ #include <pulsecore/proplist-util.h> #include "internal.h" - -#include "client-conf.h" -#include "fork-detect.h" - -#ifdef HAVE_X11 -#include "client-conf-x11.h" -#endif - #include "context.h" void pa_command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c index 57cb57c8..7b78c24e 100644 --- a/src/pulse/ext-device-manager.c +++ b/src/pulse/ext-device-manager.c @@ -27,14 +27,13 @@ #include <pulse/context.h> #include <pulse/gccmacro.h> #include <pulse/xmalloc.h> +#include <pulse/fork-detect.h> +#include <pulse/operation.h> #include <pulsecore/macro.h> #include <pulsecore/pstream-util.h> #include "internal.h" -#include "operation.h" -#include "fork-detect.h" - #include "ext-device-manager.h" enum { diff --git a/src/pulse/ext-stream-restore.c b/src/pulse/ext-stream-restore.c index 10e9fd5d..7bc1a612 100644 --- a/src/pulse/ext-stream-restore.c +++ b/src/pulse/ext-stream-restore.c @@ -25,14 +25,13 @@ #include <pulse/context.h> #include <pulse/gccmacro.h> +#include <pulse/fork-detect.h> +#include <pulse/operation.h> #include <pulsecore/macro.h> #include <pulsecore/pstream-util.h> #include "internal.h" -#include "operation.h" -#include "fork-detect.h" - #include "ext-stream-restore.h" enum { diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c index 35e091a8..ec27b928 100644 --- a/src/pulse/introspect.c +++ b/src/pulse/introspect.c @@ -29,14 +29,13 @@ #include <pulse/context.h> #include <pulse/gccmacro.h> #include <pulse/xmalloc.h> +#include <pulse/fork-detect.h> #include <pulsecore/macro.h> #include <pulsecore/core-util.h> #include <pulsecore/pstream-util.h> #include "internal.h" -#include "fork-detect.h" - #include "introspect.h" /*** Statistics ***/ diff --git a/src/pulse/scache.c b/src/pulse/scache.c index cb8d7c59..6ed80a68 100644 --- a/src/pulse/scache.c +++ b/src/pulse/scache.c @@ -28,14 +28,14 @@ #include <string.h> #include <pulse/utf8.h> -#include <pulse/scache.h> +#include <pulse/fork-detect.h> #include <pulsecore/pstream-util.h> #include <pulsecore/macro.h> #include <pulsecore/proplist-util.h> -#include "fork-detect.h" #include "internal.h" +#include "scache.h" int pa_stream_connect_upload(pa_stream *s, size_t length) { pa_tagstruct *t; diff --git a/src/pulse/stream.c b/src/pulse/stream.c index ea468a5c..ef27fe59 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -29,10 +29,10 @@ #include <string.h> #include <pulse/def.h> -#include <pulse/stream.h> #include <pulse/timeval.h> #include <pulse/rtclock.h> #include <pulse/xmalloc.h> +#include <pulse/fork-detect.h> #include <pulsecore/pstream-util.h> #include <pulsecore/log.h> @@ -41,8 +41,8 @@ #include <pulsecore/core-rtclock.h> #include <pulsecore/core-util.h> -#include "fork-detect.h" #include "internal.h" +#include "stream.h" #define AUTO_TIMING_INTERVAL_START_USEC (10*PA_USEC_PER_MSEC) #define AUTO_TIMING_INTERVAL_END_USEC (1500*PA_USEC_PER_MSEC) diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c index 203bc928..52d0af35 100644 --- a/src/pulse/subscribe.c +++ b/src/pulse/subscribe.c @@ -31,7 +31,6 @@ #include <pulsecore/pstream-util.h> #include "internal.h" - #include "subscribe.h" void pa_command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { |