From 18879dfdf57be6b6a5ca6a892c400cd0e005d77a Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Wed, 1 Sep 2004 17:41:03 +0000
Subject: 	* win/tclWin32Dll.c (TclWinCPUID): need _asm for WIN64
 (Itanium), 	until we have it, just return unknown. [Bug 1020445]

---
 ChangeLog         | 10 ++++++++++
 win/tclWin32Dll.c |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc266c4..8c81304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;
 }
-- 
cgit v0.12