ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass the environ variable from main to try to avoid Darwin's

Browse Source 
_NSGetEnviron() ugliness.
This commit is contained in:
Alexandre Julliard 2004-05-29 00:26:03 +00:00
parent 3270bb1ee1
commit 910234eafb
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wine/library.h
View File

@ -53,7 +53,7 @@ extern int __wine_main_argc;
extern char **__wine_main_argv; extern char **__wine_main_argv;
extern WCHAR **__wine_main_wargv; extern WCHAR **__wine_main_wargv;
extern char **__wine_main_environ; 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 */ /* debugging */

7
include/wine/port.h
View File

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

4
libs/wine/loader.c
View File

@ -504,7 +504,7 @@ static void debug_usage(void)
* *
* Main Wine initialisation. * 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; char *wine_debug;
int file_exists; int file_exists;
@ -515,7 +515,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size )
wine_init_argv0_path( argv[0] ); wine_init_argv0_path( argv[0] );
__wine_main_argc = argc; __wine_main_argc = argc;
__wine_main_argv = argv; __wine_main_argv = argv;
__wine_main_environ = environ; __wine_main_environ = envp;
mmap_init(); mmap_init();
if ((wine_debug = getenv("WINEDEBUG"))) if ((wine_debug = getenv("WINEDEBUG")))

3
loader/main.c
View File

@ -33,6 +33,7 @@ int main( int argc, char *argv[] )
{ {
char error[1024]; char error[1024];
int i; int i;
extern char **environ;
if (wine_main_preload_info) if (wine_main_preload_info)
{ {
@ -41,7 +42,7 @@ int main( int argc, char *argv[] )
wine_main_preload_info[i].size ); 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 ); fprintf( stderr, "wine: failed to initialize: %s\n", error );
exit(1); exit(1);
} }