summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-08-06 23:48:42 (GMT)
committerhobbs <hobbs>2003-08-06 23:48:42 (GMT)
commit632196139ecb87e0d5c65db14c7d1565a91a54a7 (patch)
treece1a82b42947b23c226b30ae075a03ef791e7eba
parenta4ccc9fa2080d17468190dde487e21cac593089f (diff)
downloadtcl-632196139ecb87e0d5c65db14c7d1565a91a54a7.zip
tcl-632196139ecb87e0d5c65db14c7d1565a91a54a7.tar.gz
tcl-632196139ecb87e0d5c65db14c7d1565a91a54a7.tar.bz2
* win/tclWinInit.c: recognize amd64 and ia32_on_win64 cpus.
-rw-r--r--ChangeLog4
-rw-r--r--win/tclWinInit.c13
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9a0160..603d7b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-06 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tclWinInit.c: recognize amd64 and ia32_on_win64 cpus.
+
2003-08-06 Don Porter <dgp@users.sourceforge.net>
* library/msgcat/msgcat.tcl: Added escape so that non-Windows
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index e913272..65ca7d1 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.41 2003/04/18 20:17:42 hobbs Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.42 2003/08/06 23:48:42 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
@@ -73,9 +79,10 @@ static char* platforms[NUMPLATFORMS] = {
"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 */