diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 08:48:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 08:48:01 (GMT) |
| commit | e6b6fcc9d42461d8ca3b153c9df5944facb99812 (patch) | |
| tree | f0080629945e07435b8bba0a6fd119bfc96160ce /win/tclWin32Dll.c | |
| parent | 99678d70f78441ead651c6b62e7af986648deaeb (diff) | |
| parent | dbae7c51f1b2d97b6262237c6cda031a6468e2b4 (diff) | |
| download | tcl-e6b6fcc9d42461d8ca3b153c9df5944facb99812.zip tcl-e6b6fcc9d42461d8ca3b153c9df5944facb99812.tar.gz tcl-e6b6fcc9d42461d8ca3b153c9df5944facb99812.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/tclWin32Dll.c')
| -rw-r--r-- | win/tclWin32Dll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index d658ce4..d846db0 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -507,12 +507,12 @@ TclWinCPUID( { int status = TCL_ERROR; -#if defined(HAVE_INTRIN_H) && defined(_WIN64) +#if defined(HAVE_INTRIN_H) && defined(_WIN64) && defined(HAVE_CPUID) __cpuid((int *)regsPtr, index); status = TCL_OK; -#elif defined(__GNUC__) +#elif defined(__GNUC__) && defined(HAVE_CPUID) # if defined(_WIN64) /* * Execute the CPUID instruction with the given index, and store results @@ -628,7 +628,7 @@ TclWinCPUID( status = registration.status; # endif /* !_WIN64 */ -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) && defined(HAVE_CPUID) # if defined(_WIN64) __cpuid(regsPtr, index); |