diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-15 15:26:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-15 15:26:24 (GMT) |
| commit | c698498d6dea2e7b6507e0a2b724c4fb7da502b1 (patch) | |
| tree | 2ad8ebaadbb24145b469e39a5050477514127825 /unix | |
| parent | fb115db64ceb2b31b68345ef5fa6a0c2442cab8e (diff) | |
| parent | 9daf0e2a9975554c4473e2233f05dac5131ff6cf (diff) | |
| download | tcl-c698498d6dea2e7b6507e0a2b724c4fb7da502b1.zip tcl-c698498d6dea2e7b6507e0a2b724c4fb7da502b1.tar.gz tcl-c698498d6dea2e7b6507e0a2b724c4fb7da502b1.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixCompat.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c index 603285d..111a082 100644 --- a/unix/tclUnixCompat.c +++ b/unix/tclUnixCompat.c @@ -334,7 +334,7 @@ TclpGetPwUid( #ifdef NEED_PW_CLEANER static void FreePwBuf( - TCL_UNUSED(ClientData)) + TCL_UNUSED(void *)) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); @@ -517,7 +517,7 @@ TclpGetGrGid( #ifdef NEED_GR_CLEANER static void FreeGrBuf( - TCL_UNUSED(ClientData)) + TCL_UNUSED(void *)) { ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); @@ -992,20 +992,19 @@ TclWinCPUID( int status = TCL_ERROR; /* See: <http://en.wikipedia.org/wiki/CPUID> */ -#if defined(HAVE_CPUID) #if defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64) __asm__ __volatile__("movq %%rbx, %%rsi \n\t" /* save %rbx */ "cpuid \n\t" "xchgq %%rsi, %%rbx \n\t" /* restore the old %rbx */ : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3]) : "a"(index)); -#else + status = TCL_OK; +#elif defined(__i386__) || defined(_M_IX86) __asm__ __volatile__("mov %%ebx, %%esi \n\t" /* save %ebx */ "cpuid \n\t" "xchg %%esi, %%ebx \n\t" /* restore the old %ebx */ : "=a"(regsPtr[0]), "=S"(regsPtr[1]), "=c"(regsPtr[2]), "=d"(regsPtr[3]) : "a"(index)); -#endif status = TCL_OK; #else (void)index; |