--- a/UnixOperatingSystem.st	Wed Jan 23 19:03:50 2013 +0100
+++ b/UnixOperatingSystem.st	Wed Jan 23 19:05:37 2013 +0100
@@ -587,7 +587,9 @@
 #   define      __wait          wait
 #   define      __waitpid       waitpid
 #  endif /* ! LINUX */
-   extern char **environ;
+#  ifndef __osx__
+    extern char **environ;
+#  endif
 # endif
 
 # define      __sigprocmask   sigprocmask
@@ -2889,8 +2891,12 @@
 %{  /* STACK: 16000 */
     char **argv;
     int nargs, i, id;
-    OBJ arg;
+    OBJ arg; 
+#ifdef __osx__
+    char **environ = _NSGetEnviron();
+#else
     extern char **environ;
+#endif
     char **_env, **_nEnv;
 
     if (__isStringLike(aCommandPath) &&
@@ -6504,9 +6510,12 @@
 
     |resultArray error dict sz "{ Class: SmallInteger }"|
 
-%{
-
+%{ 
+#ifdef __osx__
+    char **environ = _NSGetEnviron();
+#else
     extern char **environ;
+#endif
     char **env;
     int nEnv = 0;
 
@@ -13443,11 +13452,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.301 2013-01-17 22:37:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.302 2013-01-23 18:05:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.301 2013-01-17 22:37:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.302 2013-01-23 18:05:37 cg Exp $'
 ! !