diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-23 08:30:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-23 08:30:10 (GMT) |
| commit | 3c23d218351b613b0ed0fe1ae651f1f51e67884d (patch) | |
| tree | 35190af2ab6a64b3e0843fa6756dd6e7cad2863f /generic | |
| parent | fac696b394e95b3b53db29f0f642b5230492ea79 (diff) | |
| parent | 9215c2610ca2f4938aa0947bcbd1ecd19a8e5009 (diff) | |
| download | tcl-3c23d218351b613b0ed0fe1ae651f1f51e67884d.zip tcl-3c23d218351b613b0ed0fe1ae651f1f51e67884d.tar.gz tcl-3c23d218351b613b0ed0fe1ae651f1f51e67884d.tar.bz2 | |
Re-base "stop-ce" branch to core-8-branch. This is what will be proposed for 8.7 in TIP #487.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIntPlatDecls.h | 2 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 494d6f1..1222cee 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -559,6 +559,8 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; # define TclWinGetServByName getservbyname # define TclWinGetSockOpt getsockopt # define TclWinSetSockOpt setsockopt +# undef TclWinGetPlatformId +# define TclWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */ #else # undef TclpGetPid # define TclpGetPid(pid) ((unsigned long) (pid)) diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index d2de021..1c11c61 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -136,8 +136,6 @@ TclpIsAtty(int fd) static int TclWinGetPlatformId() { - /* Don't bother to determine the real platform on cygwin, - * because VER_PLATFORM_WIN32_NT is the only supported platform */ return 2; /* VER_PLATFORM_WIN32_NT */; } |