summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorMaarten Bosmans <mkbosmans@gmail.com>2011-06-23 22:21:03 +0200
committerColin Guthrie <colin@mageia.org>2011-06-24 00:34:05 +0100
commit5818a2c63e9a52a545b9c8eb6fdbfa24cfee822f (patch)
tree9d3d4c27d9dfedd4d3384e3559d01d673c042290 /src/daemon
parent3adc43b8fe507e3140f7d6f9bab32584b9eadfa4 (diff)
win32: Make some unused-variable warnings go away
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/daemon-conf.c11
-rw-r--r--src/daemon/main.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 67b772ae..bb929091 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -470,6 +470,10 @@ static int parse_nice_level(const char *filename, unsigned line, const char *sec
}
static int parse_rtprio(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+#ifdef OS_IS_WIN32
+ pa_log("[%s:%u] Realtime priority not available on win32.", filename, line);
+#else
+# ifdef HAVE_SCHED_H
pa_daemon_conf *c = data;
int32_t rtprio;
@@ -478,16 +482,15 @@ static int parse_rtprio(const char *filename, unsigned line, const char *section
pa_assert(rvalue);
pa_assert(data);
-#ifndef OS_IS_WIN32
-# ifdef HAVE_SCHED_H
if (pa_atoi(rvalue, &rtprio) < 0 || rtprio < sched_get_priority_min(SCHED_FIFO) || rtprio > sched_get_priority_max(SCHED_FIFO)) {
pa_log("[%s:%u] Invalid realtime priority '%s'.", filename, line, rvalue);
return -1;
}
-# endif
-#endif
c->realtime_priority = (int) rtprio;
+# endif
+#endif /* OS_IS_WIN32 */
+
return 0;
}
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 90ed5ce0..94c87d15 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -748,7 +748,9 @@ int main(int argc, char *argv[]) {
}
if (conf->daemonize) {
+#ifdef HAVE_FORK
pid_t child;
+#endif
if (pa_stdio_acquire() < 0) {
pa_log(_("Failed to acquire stdio."));