From 4d8cf471783a6e4c5e551c6ddf208acb03453e61 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 2 May 2011 09:38:40 +0200
Subject: [PATCH] fix build on mac

environ needs to be declared properly
(cherry picked from commit aae6ef391d2ee2fa5b91c834ea65f14fd61e5af6)
---
 src/corelib/io/qprocess_unix.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index 7a9e75d5340..fcb0c4b47c5 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -467,6 +467,18 @@ bool QProcessPrivate::createChannel(Channel &channel)
     }
 }
 
+QT_BEGIN_INCLUDE_NAMESPACE
+#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+#elif defined(Q_OS_SYMBIAN) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES))
+  static char *qt_empty_environ[] = { 0 };
+#define environ qt_empty_environ
+#else
+  extern char **environ;
+#endif
+QT_END_INCLUDE_NAMESPACE
+
 QProcessEnvironment QProcessEnvironment::systemEnvironment()
 {
     QProcessEnvironment env;