diff options
| author | hobbs <hobbs> | 2004-03-21 21:03:35 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-03-21 21:03:35 (GMT) |
| commit | a2a94771f68b17613c897f5b4ab91dfb979c85d3 (patch) | |
| tree | ee47118957c7dc0598e08e7e6be3cceb0104c19c | |
| parent | ccb560364793a1f26ccad8d6d538bc0469c2e230 (diff) | |
| download | tcl-a2a94771f68b17613c897f5b4ab91dfb979c85d3.zip tcl-a2a94771f68b17613c897f5b4ab91dfb979c85d3.tar.gz tcl-a2a94771f68b17613c897f5b4ab91dfb979c85d3.tar.bz2 | |
* win/tclWinInit.c (TclpSetInitialEncodings): recognize WIN32_CE
as a unicode (WCHAR) platform.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/tclWinInit.c | 13 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2004-03-21 Jeff Hobbs <jeffh@ActiveState.com> + + * win/tclWinInt.h: define VER_PLATFORM_WIN32_CE if not already set. + * win/tclWinInit.c (TclpSetInitialEncodings): recognize WIN32_CE + as a unicode (WCHAR) platform. + 2004-03-15 Miguel Sofer <msofer@users.sf.net> * generic/tclCompile.c (TclCompileScript): diff --git a/win/tclWinInit.c b/win/tclWinInit.c index 96d6980..a65c970 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclWinInit.c,v 1.40.2.3 2004/02/20 05:27:17 mdejong Exp $ + * RCS: @(#) $Id: tclWinInit.c,v 1.40.2.4 2004/03/21 21:03:37 hobbs Exp $ */ #include "tclWinInt.h" @@ -569,14 +569,17 @@ TclpSetInitialEncodings() char buf[4 + TCL_INTEGER_SPACE]; if (libraryPathEncodingFixed == 0) { - int platformId; + int platformId, useWide; + platformId = TclWinGetPlatformId(); - TclWinSetInterfaces(platformId == VER_PLATFORM_WIN32_NT); - + useWide = ((platformId == VER_PLATFORM_WIN32_NT) + || (platformId == VER_PLATFORM_WIN32_CE)); + TclWinSetInterfaces(useWide); + wsprintfA(buf, "cp%d", GetACP()); Tcl_SetSystemEncoding(NULL, buf); - if (platformId != VER_PLATFORM_WIN32_NT) { + if (!useWide) { Tcl_Obj *pathPtr = TclGetLibraryPath(); if (pathPtr != NULL) { int i, objc; |