diff options
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/caps.c | 1 | ||||
-rw-r--r-- | src/daemon/cmdline.c | 3 | ||||
-rw-r--r-- | src/daemon/cpulimit.c | 3 | ||||
-rw-r--r-- | src/daemon/daemon-conf.c | 3 | ||||
-rw-r--r-- | src/daemon/dumpmodules.c | 3 | ||||
-rw-r--r-- | src/daemon/main.c | 18 |
6 files changed, 19 insertions, 12 deletions
diff --git a/src/daemon/caps.c b/src/daemon/caps.c index 8d429459..e12d33fb 100644 --- a/src/daemon/caps.c +++ b/src/daemon/caps.c @@ -33,6 +33,7 @@ #endif #include <polypcore/log.h> + #include "caps.h" #ifdef HAVE_GETUID diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index 0b5f9ec7..b6ab1283 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -30,11 +30,12 @@ #include <getopt.h> #include <sys/stat.h> -#include "cmdline.h" #include <polypcore/util.h> #include <polypcore/strbuf.h> #include <polypcore/xmalloc.h> +#include "cmdline.h" + /* Argument codes for getopt_long() */ enum { ARG_HELP = 256, diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c index 6887796f..d7a24b8e 100644 --- a/src/daemon/cpulimit.c +++ b/src/daemon/cpulimit.c @@ -23,10 +23,11 @@ #include <config.h> #endif -#include "cpulimit.h" #include <polypcore/util.h> #include <polypcore/log.h> +#include "cpulimit.h" + #ifdef HAVE_SIGXCPU #include <errno.h> diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 8fe3c4cc..ecabce40 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -29,13 +29,14 @@ #include <assert.h> #include <unistd.h> -#include "daemon-conf.h" #include <polypcore/util.h> #include <polypcore/xmalloc.h> #include <polypcore/strbuf.h> #include <polypcore/conf-parser.h> #include <polypcore/resampler.h> +#include "daemon-conf.h" + #ifndef DEFAULT_CONFIG_DIR # ifndef OS_IS_WIN32 # define DEFAULT_CONFIG_DIR "/etc/polypaudio" diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c index 8d8eb0b9..bf29a681 100644 --- a/src/daemon/dumpmodules.c +++ b/src/daemon/dumpmodules.c @@ -29,10 +29,11 @@ #include <stdio.h> #include <ltdl.h> -#include "dumpmodules.h" #include <polypcore/modinfo.h> #include <polypcore/util.h> +#include "dumpmodules.h" + #define PREFIX "module-" static void short_info(const char *name, PA_GCC_UNUSED const char *path, pa_modinfo *i) { diff --git a/src/daemon/main.c b/src/daemon/main.c index 6be83d8c..638c2f3f 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -47,26 +47,28 @@ #include <tcpd.h> #endif -#include <polypcore/winsock.h> +#include "../polypcore/winsock.h" + +#include <polyp/mainloop.h> +#include <polyp/mainloop-signal.h> #include <polypcore/core.h> #include <polypcore/memblock.h> -#include <polyp/mainloop.h> #include <polypcore/module.h> -#include <polyp/mainloop-signal.h> -#include "cmdline.h" #include <polypcore/cli-command.h> +#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> + +#include "cmdline.h" #include "cpulimit.h" -#include <polypcore/log.h> #include "daemon-conf.h" #include "dumpmodules.h" #include "caps.h" -#include <polypcore/cli-text.h> -#include <polypcore/pid.h> -#include <polypcore/namereg.h> #ifdef HAVE_LIBWRAP /* Only one instance of these variables */ |