diff options
| author | hobbs <hobbs@noemail.net> | 2004-09-01 17:41:03 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2004-09-01 17:41:03 (GMT) |
| commit | 4a33165ba472fc4f9306b99250f62f66f5dbddbf (patch) | |
| tree | b13e968880a6a936f03775d96383e5f6670991d0 | |
| parent | 172abdd0aff931b778076040b9e77a42e91523c3 (diff) | |
| download | tcl-4a33165ba472fc4f9306b99250f62f66f5dbddbf.zip tcl-4a33165ba472fc4f9306b99250f62f66f5dbddbf.tar.gz tcl-4a33165ba472fc4f9306b99250f62f66f5dbddbf.tar.bz2 | |
* win/tclWin32Dll.c (TclWinCPUID): need _asm for WIN64 (Itanium),
until we have it, just return unknown. [Bug 1020445]
FossilOrigin-Name: a8677f610a206f095cb8aace5f74daa07e87812c
| -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-09-01 Donal K. Fellows <donal.k.fellows@man.ac.uk> * doc/regsub.n, doc/RegConfig.3, doc/Environment.3: diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 7c80eea..c4f6e5d 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.38 2004/06/29 10:07:57 vincentdarley Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.39 2004/09/01 17:41:03 hobbs Exp $ */ #include "tclWinInt.h" @@ -1169,7 +1169,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 */ @@ -1212,7 +1212,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; } |