From b73e43e34794f4903b0bf2e0fc1298547ef01faf Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Tue, 1 Feb 2000 03:15:25 +0000 Subject: import dejagnu-2000-01-31 snapshot --- tcl/ChangeLog | 6 ++++++ tcl/generic/tclEnv.c | 4 ++-- tcl/win/tclWin32Dll.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tcl/ChangeLog b/tcl/ChangeLog index ff4973186e4..c217f8dc24c 100644 --- a/tcl/ChangeLog +++ b/tcl/ChangeLog @@ -1,3 +1,9 @@ +2000-01-26 DJ Delorie + + * win/tclWin32Dll.c (DllMain): Use standard _imp__reent_data, + not old-style __imp_reent_data + * generic/tclEnv.c (environ): ditto for _imp____cygwin_environ + 2000-01-17 Drew Moseley * cygwin/configure.in: Fixed bug in setting of shell variable which diff --git a/tcl/generic/tclEnv.c b/tcl/generic/tclEnv.c index f67918b506d..d7532582acb 100644 --- a/tcl/generic/tclEnv.c +++ b/tcl/generic/tclEnv.c @@ -23,9 +23,9 @@ /* On cygwin32, the environment is imported from the cygwin32 DLL. */ -extern char ***__imp___cygwin_environ; +extern char ***_imp____cygwin_environ; -#define environ (*__imp___cygwin_environ) +#define environ (*_imp____cygwin_environ) /* We need to use a special putenv function to handle PATH. */ #ifndef USE_PUTENV diff --git a/tcl/win/tclWin32Dll.c b/tcl/win/tclWin32Dll.c index 9f4269b8a13..f44f17aeb86 100644 --- a/tcl/win/tclWin32Dll.c +++ b/tcl/win/tclWin32Dll.c @@ -62,7 +62,7 @@ BOOL APIENTRY DllMain _ANSI_ARGS_((HINSTANCE hInst, /* cygwin32 requires an impure pointer variable, which must be explicitly initialized when the DLL starts up. */ struct _reent *_impure_ptr; -extern struct _reent *__imp_reent_data; +extern struct _reent *_imp__reent_data; #endif /* END CYGNUS LOCAL */ @@ -122,7 +122,7 @@ DllMain(hInst, reason, reserved) #ifdef __CYGWIN32__ /* cygwin32 requires the impure data pointer to be initialized when the DLL starts up. */ - _impure_ptr = __imp_reent_data; + _impure_ptr = _imp__reent_data; #endif /* END CYGNUS LOCAL */ -- cgit v1.2.1