diff options
| author | pooryorick <com.digitalsmarties@pooryorick.com> | 2017-12-26 17:27:28 (GMT) |
|---|---|---|
| committer | pooryorick <com.digitalsmarties@pooryorick.com> | 2017-12-26 17:27:28 (GMT) |
| commit | b0e6ac7da971dfe524e51a17770c118b3af51505 (patch) | |
| tree | 35e94ff929742cb15f860eb9cef04ea1d2b21410 /unix/tclUnixInit.c | |
| parent | 3ddcb1cfb5dd70afa094e3113ab1946df9cbe222 (diff) | |
| parent | 9a9b619c9f29470dab9e33b0c593b7e648224515 (diff) | |
| download | tcl-b0e6ac7da971dfe524e51a17770c118b3af51505.zip tcl-b0e6ac7da971dfe524e51a17770c118b3af51505.tar.gz tcl-b0e6ac7da971dfe524e51a17770c118b3af51505.tar.bz2 | |
merge core-8-branch
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index feeffa6..cc66569 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -39,11 +39,6 @@ DLLIMPORT extern __stdcall void FreeLibrary(void *); DLLIMPORT extern __stdcall void *GetProcAddress(void *, const char *); DLLIMPORT extern __stdcall void GetSystemInfo(void *); -#define NUMPLATFORMS 4 -static const char *const platforms[NUMPLATFORMS] = { - "Win32s", "Windows 95", "Windows NT", "Windows CE" -}; - #define NUMPROCESSORS 11 static const char *const processors[NUMPROCESSORS] = { "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil", @@ -453,7 +448,7 @@ TclpInitPlatform(void) void TclpInitLibraryPath( char **valuePtr, - size_t *lengthPtr, + unsigned int *lengthPtr, Tcl_Encoding *encodingPtr) { #define LIBRARY_SIZE 32 @@ -890,10 +885,7 @@ TclpSetVariables( GetSystemInfo(&sysInfo); - if (osInfo.dwPlatformId < NUMPLATFORMS) { - Tcl_SetVar2(interp, "tcl_platform", "os", - platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY); - } + Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY); sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion); Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY); if (sysInfo.wProcessorArchitecture < NUMPROCESSORS) { |