mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

caps: Use standard macro when checking for Linux

Browse source 
linux and __linux are non-standard, according to
http://sourceforge.net/p/predef/wiki/OperatingSystems/

Reported-By: Damir Jelić <poljarinho@gmail.com>
This commit is contained in:
Tanu Kaskinen 2014-01-10 12:41:00 +02:00
parent 56e578c310
commit 25b7b39367
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/caps.c
View file

@ -39,7 +39,7 @@
#include "caps.h" #include "caps.h"
/* Glibc <= 2.2 has broken unistd.h */ /* Glibc <= 2.2 has broken unistd.h */
#if defined(linux) && (__GLIBC__ <= 2 && __GLIBC_MINOR__ <= 2) #if defined(__linux__) && (__GLIBC__ <= 2 && __GLIBC_MINOR__ <= 2)
int setresgid(gid_t r, gid_t e, gid_t s); int setresgid(gid_t r, gid_t e, gid_t s);
int setresuid(uid_t r, uid_t e, uid_t s); int setresuid(uid_t r, uid_t e, uid_t s);
#endif #endif
@ -80,7 +80,7 @@ void pa_drop_root(void) {
void pa_drop_caps(void) { void pa_drop_caps(void) {
#ifdef HAVE_SYS_CAPABILITY_H #ifdef HAVE_SYS_CAPABILITY_H
#if defined(__linux) #if defined(__linux__)
cap_t caps; cap_t caps;
pa_assert_se(caps = cap_init()); pa_assert_se(caps = cap_init());
pa_assert_se(cap_clear(caps) == 0); pa_assert_se(cap_clear(caps) == 0);
@ -88,7 +88,7 @@ void pa_drop_caps(void) {
pa_assert_se(cap_free(caps) == 0); pa_assert_se(cap_free(caps) == 0);
#else #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 */ #endif /* __linux__ */
#else /* HAVE_SYS_CAPABILITY_H */ #else /* HAVE_SYS_CAPABILITY_H */
pa_log_warn("Normally all extra capabilities would be dropped now, but " pa_log_warn("Normally all extra capabilities would be dropped now, but "
"that's impossible because PulseAudio was built without " "that's impossible because PulseAudio was built without "