From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Feb 2009 23:25:47 +0000 (+0100)
Subject: A few MacOS X portability fixes
X-Git-Tag: 1.0_branch~2168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04c3c6716b20ca8362ceea3d2e7fa23954f9a441;p=profile%2Fivi%2Fpulseaudio.git

A few MacOS X portability fixes

Based on patches contributed by "Tron".

See bug #478.
---

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index b7ebdeb..ad6c6ca 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 c09c8af..8a447cf 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;