summaryrefslogtreecommitdiffstats
path: root/win/tclWin32Dll.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-08-17 22:26:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-08-17 22:26:48 (GMT)
commitf338acabb27d64eddd5ccccd3adf4fdbfbcc94f9 (patch)
tree04de0545f0e808536feee3596569bcdc37f31c7a /win/tclWin32Dll.c
parent3fa2df99d2930a900ec7494cb122eb01b975c6c6 (diff)
parenta18c3eca9bb851589fcb45fbcef0d8be43396a15 (diff)
downloadtcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.zip
tcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.tar.gz
tcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.tar.bz2
Adopt some harmless changes from the 'irontcl' branch. Left 2 changes behind which I'm not so sure about (but I could be convinced ...). Ticket with explanation would be appreciated!
Diffstat (limited to 'win/tclWin32Dll.c')
-rw-r--r--win/tclWin32Dll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 688fa8d..84c7a97 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -29,7 +29,7 @@ static int platformId; /* Running under NT, or 95/98? */
* VC++ 5.x has no 'cpuid' assembler instruction, so we must emulate it
*/
-#if defined(_MSC_VER) && (_MSC_VER <= 1100)
+#if defined(_MSC_VER) && (_MSC_VER <= 1100) && defined (_M_IX86)
#define cpuid __asm __emit 0fh __asm __emit 0a2h
#endif
@@ -735,7 +735,7 @@ TclWinCPUID(
__cpuid(regsPtr, index);
status = TCL_OK;
-# else
+# elif defined (_M_IX86)
/*
* Define a structure in the stack frame to hold the registers.
*/