diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-20 14:36:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-01-20 14:36:36 (GMT) |
| commit | 69868ee129e5fe87ad3e38afa7b92208974af881 (patch) | |
| tree | d324ebcf999d73e37b50ca7b0f1b78aafce2cca4 /unix/tclUnixInit.c | |
| parent | 603e23c2a9f36afa883135a76f147807f273e58d (diff) | |
| parent | 7ea11c7f9865dc680b102ea9497fc75634be25e4 (diff) | |
| download | tcl-69868ee129e5fe87ad3e38afa7b92208974af881.zip tcl-69868ee129e5fe87ad3e38afa7b92208974af881.tar.gz tcl-69868ee129e5fe87ad3e38afa7b92208974af881.tar.bz2 | |
merge core-8-branch. Now tested as well with new nmake system.
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index feeffa6..630460a 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 @@ -582,12 +577,6 @@ TclpSetInitialEncodings(void) Tcl_DStringFree(&encodingName); } -void -TclpSetInterfaces(void) -{ - /* do nothing */ -} - static const char * SearchKnownEncodings( const char *encoding) @@ -890,10 +879,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) { |