diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-25 15:03:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-25 15:03:06 (GMT) |
| commit | b86333ba016d7979b07dd1819c38ffcbea74967e (patch) | |
| tree | 33c1dc75a5240a76e72ca55a455d4d0e263113e2 /generic/tclStubInit.c | |
| parent | 652e994c7374458d425e6fa792645d6a3c9fc212 (diff) | |
| parent | 6f438769bc6be9f629476c948b96d7d00c7586e0 (diff) | |
| download | tcl-b86333ba016d7979b07dd1819c38ffcbea74967e.zip tcl-b86333ba016d7979b07dd1819c38ffcbea74967e.tar.gz tcl-b86333ba016d7979b07dd1819c38ffcbea74967e.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclStubInit.c')
| -rw-r--r-- | generic/tclStubInit.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index dab8262..47533bd 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -373,6 +373,7 @@ TclWinGetPlatformId(void) #endif /* TCL_NO_DEPRECATED */ #define TclpCreateTempFile_ TclpCreateTempFile +#define TclUnixWaitForFile_ TclUnixWaitForFile #ifndef MAC_OSX_TCL /* On UNIX, fill with other stub entries */ #define TclMacOSXGetFileAttribute (int (*)(Tcl_Interp *, int, Tcl_Obj *, Tcl_Obj **))(void *)TclpCreateProcess #define TclMacOSXSetFileAttribute (int (*)(Tcl_Interp *, int, Tcl_Obj *, Tcl_Obj *))(void *)isatty @@ -388,7 +389,7 @@ TclWinGetPlatformId(void) # define TclpReaddir 0 # define TclpIsAtty 0 #elif defined(__CYGWIN__) -# define TclpIsAtty TclPlatIsAtty +# define TclpIsAtty isatty #if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 static void doNothing(void) @@ -399,20 +400,6 @@ doNothing(void) # define TclWinAddProcess (void (*) (void *, unsigned int)) doNothing # define TclWinFlushDirtyChannels doNothing -static int -TclpIsAtty(int fd) -{ - return isatty(fd); -} - -void *TclWinGetTclInstance() -{ - void *hInstance = NULL; - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (const wchar_t *)&TclpIsAtty, &hInstance); - return hInstance; -} - #if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 #define TclWinSetSockOpt winSetSockOpt static int @@ -452,6 +439,14 @@ TclWinNoBackslash(char *path) return path; } +void *TclWinGetTclInstance() +{ + void *hInstance = NULL; + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (const wchar_t *)&TclWinNoBackslash, &hInstance); + return hInstance; +} + int TclpGetPid(Tcl_Pid pid) { @@ -1000,7 +995,7 @@ static const TclIntPlatStubs tclIntPlatStubs = { TclpCreateCommandChannel, /* 2 */ TclpCreatePipe, /* 3 */ TclpCreateProcess, /* 4 */ - 0, /* 5 */ + TclUnixWaitForFile_, /* 5 */ TclpMakeFile, /* 6 */ TclpOpenFile, /* 7 */ TclUnixWaitForFile, /* 8 */ @@ -1066,7 +1061,7 @@ static const TclIntPlatStubs tclIntPlatStubs = { TclpCreateCommandChannel, /* 2 */ TclpCreatePipe, /* 3 */ TclpCreateProcess, /* 4 */ - 0, /* 5 */ + TclUnixWaitForFile_, /* 5 */ TclpMakeFile, /* 6 */ TclpOpenFile, /* 7 */ TclUnixWaitForFile, /* 8 */ |