diff options
| author | hobbs <hobbs> | 2004-09-01 17:28:04 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-09-01 17:28:04 (GMT) |
| commit | d5076f1e339e9e35c35cbbcf1afb0e1c1a1eff0c (patch) | |
| tree | 485c279088867cbb14cb9b08305fc26788d93180 | |
| parent | 3f4f8a12933888bb662d4f08a87785785d8ffdaf (diff) | |
| download | tcl-d5076f1e339e9e35c35cbbcf1afb0e1c1a1eff0c.zip tcl-d5076f1e339e9e35c35cbbcf1afb0e1c1a1eff0c.tar.gz tcl-d5076f1e339e9e35c35cbbcf1afb0e1c1a1eff0c.tar.bz2 | |
* win/tclWin32Dll.c (TclWinCPUID): need _asm for WIN64 (Itanium),
until we have it, just return unknown. [Bug 1020445]
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | win/tclWin32Dll.c | 6 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2004-09-01 Jeff Hobbs <jeffh@ActiveState.com> + + * win/tclWinReg.c (BroadcastValue): WIN64 cast corrections + + * win/tclWinDde.c (DdeClientWindowProc): + (DdeServicesOnAck, DdeEnumWindowsCallback): WIN64 corrections + + * win/tclWin32Dll.c (TclWinCPUID): need _asm for WIN64 (Itanium), + until we have it, just return unknown. [Bug 1020445] + 2004-08-30 Donal K. Fellows <donal.k.fellows@man.ac.uk> * generic/tclCmdMZ.c (Tcl_StringObjCmd): Stop [string map] from diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index f30b764..5e72682 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWin32Dll.c,v 1.24.2.5 2004/07/02 16:52:19 vincentdarley Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.24.2.6 2004/09/01 17:28:04 hobbs Exp $ */ #include "tclWinInt.h" @@ -1120,7 +1120,7 @@ TclWinCPUID( unsigned int index, /* Which CPUID value to retrieve */ # endif -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && !defined(_WIN64) /* Define a structure in the stack frame to hold the registers */ @@ -1163,7 +1163,7 @@ TclWinCPUID( unsigned int index, /* Which CPUID value to retrieve */ #else /* Don't know how to do assembly code for - * this compiler */ + * this compiler and/or architecture */ #endif return status; } |