Index: env.c
===================================================================
--- env.c	(revision 220285)
+++ env.c	(working copy)
@@ -214,11 +214,11 @@
 #elif defined (sun)
   extern char **_environ;
   return _environ;
+#elif defined (__APPLE__) && !defined (__arm__)
+  return *_NSGetEnviron ();
 #elif ! (defined (__vxworks))
   extern char **environ;
   return environ;
-#elif defined (__APPLE__) && !defined (__arm__)
-  return *_NSGetEnviron ();
 #else
   return environ;
 #endif