diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-05 07:07:10 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-05 07:07:10 (GMT) |
commit | 7c71d5645fb9359ded5350f20396923f164a735a (patch) | |
tree | d60c6429b2047f18a48d24225c79630fdd2010ec /generic/tclEnv.c | |
parent | d1cc337c2f7fc13532fe1308462f5c85f3011171 (diff) | |
download | tcl-7c71d5645fb9359ded5350f20396923f164a735a.zip tcl-7c71d5645fb9359ded5350f20396923f164a735a.tar.gz tcl-7c71d5645fb9359ded5350f20396923f164a735a.tar.bz2 |
cygwin should use SetEnvironmentVariable for windows env
Diffstat (limited to 'generic/tclEnv.c')
-rw-r--r-- | generic/tclEnv.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c index a516cce..24fa106 100644 --- a/generic/tclEnv.c +++ b/generic/tclEnv.c @@ -45,11 +45,8 @@ MODULE_SCOPE void TclSetEnv(const char *name, const char *value); MODULE_SCOPE void TclUnsetEnv(const char *name); #if defined(__CYGWIN__) -/* On Cygwin, the environment is imported from the Cygwin DLL. */ - DLLIMPORT extern int cygwin_posix_to_win32_path_list_buf_size(char *value); - DLLIMPORT extern void cygwin_posix_to_win32_path_list(char *buf, char *value); -# define putenv TclCygwinPutenv -static void TclCygwinPutenv(char *string); + static void TclCygwinPutenv(char *string); +# define putenv TclCygwinPutenv #endif /* @@ -753,15 +750,11 @@ TclCygwinPutenv( */ if (strcmp(name, "Path") == 0) { -#ifdef __WIN32__ - SetEnvironmentVariable("PATH", NULL); -#endif + SetEnvironmentVariableA("PATH", NULL); unsetenv("PATH"); } -#ifdef __WIN32__ - SetEnvironmentVariable(name, value); -#endif + SetEnvironmentVariableA(name, value); } else { char *buf; @@ -769,9 +762,7 @@ TclCygwinPutenv( * Eliminate any Path variable, to prevent any confusion. */ -#ifdef __WIN32__ - SetEnvironmentVariable("Path", NULL); -#endif + SetEnvironmentVariableA("Path", NULL); unsetenv("Path"); if (value == NULL) { @@ -784,9 +775,7 @@ TclCygwinPutenv( cygwin_posix_to_win32_path_list(value, buf); } -#ifdef __WIN32__ - SetEnvironmentVariable(name, buf); -#endif + SetEnvironmentVariableA(name, buf); } } #endif /* __CYGWIN__ */ |