[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test1-14-g04c3c67

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  9f39a44488644e8d54e9c8a4096abf2d39040c1f (commit)

- Log -----------------------------------------------------------------
04c3c67... A few MacOS X portability fixes
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/core-util.c     |    4 ++++
 src/pulsecore/proplist-util.c |   10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------

commit 04c3c6716b20ca8362ceea3d2e7fa23954f9a441
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 6 00:25:47 2009 +0100

    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;
 

-- 
hooks/post-receive
PulseAudio Sound Server