summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/pulsecore/core-util.c4
-rw-r--r--src/pulsecore/proplist-util.c10
2 files changed, 11 insertions, 3 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index b7ebdeb7..ad6c6ca9 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -88,6 +88,10 @@
#include <samplerate.h>
#endif
+#ifdef __APPLE__
+#include <xlocale.h>
+#endif
+
#include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulse/utf8.h>
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index c09c8af5..8a447cf7 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -27,6 +27,13 @@
#include <locale.h>
#include <dlfcn.h>
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#elif !HAVE_DECL_ENVIRON
+extern char **environ;
+#endif
+
#include <pulse/proplist.h>
#include <pulse/utf8.h>
#include <pulse/xmalloc.h>
@@ -37,9 +44,6 @@
#include "proplist-util.h"
void pa_init_proplist(pa_proplist *p) {
-#if !HAVE_DECL_ENVIRON
- extern char **environ;
-#endif
char **e;
const char *pp;