[pulseaudio-commits] src/daemon

Tanu Kaskinen tanuk at kemper.freedesktop.org
Mon Dec 30 04:35:07 PST 2013


 src/daemon/caps.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4c5ec015a4b33015114a66ec2f9c435ba8e41c7d
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Mon Dec 30 14:31:33 2013 +0200

    caps: Fix platform checking
    
    The "#elif __FreeBSD__" line caused a warning, because __FreeBSD__ was
    not defined.

diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 7fc7357..4455db3 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -80,16 +80,16 @@ void pa_drop_root(void) {
 
 void pa_drop_caps(void) {
 #ifdef HAVE_SYS_CAPABILITY_H
-#ifdef __linux
+#if defined(__linux)
     cap_t caps;
     pa_assert_se(caps = cap_init());
     pa_assert_se(cap_clear(caps) == 0);
     pa_assert_se(cap_set_proc(caps) == 0);
     pa_assert_se(cap_free(caps) == 0);
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
     pa_assert_se (cap_enter () == 0);
 #else
-#error Don't know how to do capabilities on your system.  Please send a patch.
+#error "Don't know how to do capabilities on your system.  Please send a patch."
 #endif /* __linux */
 #else /* HAVE_SYS_CAPABILITY_H */
     pa_log_warn("Normally all extra capabilities would be dropped now, but "



More information about the pulseaudio-commits mailing list