Moved environ definition to port.h.

include/wine/port.h

@@ -172,6 +172,14 @@ struct statvfs
 # define S_IXOTH S_IEXEC
 #endif
 
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
+extern char **environ;
+#endif
+
+
 /****************************************************************
  * Constants
  */

libs/wine/config.c

@@ -277,7 +277,7 @@ void wine_exec_wine_binary( const char *name, char **argv, char **envp )
 {
     const char *path, *pos, *ptr;
 
-    if (!envp) envp = __wine_main_environ;
+    if (!envp) envp = environ;
     if (!name) name = argv0_name;
 
     /* first, try bin directory */

libs/wine/loader.c

@@ -71,13 +71,6 @@ static const char **dll_paths;
 static int nb_dll_paths;
 static int dll_path_maxlen;
 
-#ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-
 extern void mmap_init(void);
 
 /* build the dll load path from the WINEDLLPATH variable */