summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--win/tclWinInit.c13
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 789b19c..72c08d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;