From 3f8d9162c4a63b45762caa5a49356411f606678c Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 6 Aug 2003 23:50:06 +0000 Subject: * win/tclWinInit.c: recognize amd64 and ia32_on_win64 cpus and Windows CE platform. --- ChangeLog | 13 +++++++++---- win/tclWinInit.c | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9592e2..cf21146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ +2003-08-06 Jeff Hobbs + + * win/tclWinInit.c: recognize amd64 and ia32_on_win64 cpus and + Windows CE platform. + 2003-08-06 Don Porter - * library/msgcat/msgcat.tcl: Added escape so that non-Windows - * library/msgcat/pkgIndex.tcl: platforms do not try to use the - registry package. This can save a costly and pointless package - search. Bumped to 1.3.1. Thanks to "imdave1". [Bug 781609]. + * library/msgcat/msgcat.tcl: Added escape so that non-Windows + * library/msgcat/pkgIndex.tcl: platforms do not try to use the + registry package. This can save a costly and pointless package + search. Bumped to 1.3.1. Thanks to "imdave1". [Bug 781609]. 2003-08-05 Miguel Sofer diff --git a/win/tclWinInit.c b/win/tclWinInit.c index 2ab64a3..f3f0865 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 2003/02/27 03:47:09 chengyemao Exp $ + * RCS: @(#) $Id: tclWinInit.c,v 1.40.2.1 2003/08/06 23:50:06 hobbs Exp $ */ #include "tclWinInt.h" @@ -58,6 +58,12 @@ typedef struct { #ifndef PROCESSOR_ARCHITECTURE_MSIL #define PROCESSOR_ARCHITECTURE_MSIL 8 #endif +#ifndef PROCESSOR_ARCHITECTURE_AMD64 +#define PROCESSOR_ARCHITECTURE_AMD64 9 +#endif +#ifndef PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 +#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 +#endif #ifndef PROCESSOR_ARCHITECTURE_UNKNOWN #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF #endif @@ -68,14 +74,15 @@ typedef struct { */ -#define NUMPLATFORMS 3 +#define NUMPLATFORMS 4 static char* platforms[NUMPLATFORMS] = { - "Win32s", "Windows 95", "Windows NT" + "Win32s", "Windows 95", "Windows NT", "Windows CE" }; -#define NUMPROCESSORS 9 +#define NUMPROCESSORS 11 static char* processors[NUMPROCESSORS] = { - "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil" + "intel", "mips", "alpha", "ppc", "shx", "arm", "ia64", "alpha64", "msil", + "amd64", "ia32_on_win64" }; /* Used to store the encoding used for binary files */ -- cgit v0.12