commit 910234eafb796c581919eb1f3b21c5d105eb062c
author Alexandre Julliard <julliard@winehq.org> Sat May 29 00:26:03 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 29 00:26:03 2004 +0000
tree dbdde9d57fbcfe45517a6e5d5862dbbeecaadb1a
parent 3270bb1ee186c89e80e73819404fedaeb99e9a4c

Pass the environ variable from main to try to avoid Darwin's
_NSGetEnviron() ugliness.

include/wine/library.h

diff --git a/include/wine/library.h b/include/wine/library.h
index 93802b8..c336504 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -53,7 +53,7 @@
 extern char **__wine_main_argv;
 extern WCHAR **__wine_main_wargv;
 extern char **__wine_main_environ;
-extern void wine_init( int argc, char *argv[], char *error, int error_size );
+extern void wine_init( int argc, char *argv[], char *envp[], char *error, int error_size );
 
 /* debugging */
 

include/wine/port.h

diff --git a/include/wine/port.h b/include/wine/port.h
index c524cdb..bff0ed3 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -172,13 +172,6 @@
 # define S_IXOTH S_IEXEC
 #endif
 
-#ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-
 
 /****************************************************************
  * Constants

libs/wine/loader.c

diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 35e5f18..ad35c7b 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -504,7 +504,7 @@
  *
  * Main Wine initialisation.
  */
-void wine_init( int argc, char *argv[], char *error, int error_size )
+void wine_init( int argc, char *argv[], char *envp[], char *error, int error_size )
 {
     char *wine_debug;
     int file_exists;
@@ -515,7 +515,7 @@
     wine_init_argv0_path( argv[0] );
     __wine_main_argc = argc;
     __wine_main_argv = argv;
-    __wine_main_environ = environ;
+    __wine_main_environ = envp;
     mmap_init();
 
     if ((wine_debug = getenv("WINEDEBUG")))

loader/main.c

diff --git a/loader/main.c b/loader/main.c
index cd45733..3677fe5 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -33,6 +33,7 @@
 {
     char error[1024];
     int i;
+    extern char **environ;
 
     if (wine_main_preload_info)
     {
@@ -41,7 +42,7 @@
                                          wine_main_preload_info[i].size );
     }
 
-    wine_init( argc, argv, error, sizeof(error) );
+    wine_init( argc, argv, environ, error, sizeof(error) );
     fprintf( stderr, "wine: failed to initialize: %s\n", error );
     exit(1);
 }