Module: wine Branch: master Commit: 193d15cc3c5830c8986c028743900ab6833943a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193d15cc3c5830c8986c028743...
Author: Charles Davis cdavis5x@gmail.com Date: Thu Jan 22 23:30:54 2015 -0700
kernel32: Don't use %gs on 64-bit Mac OS.
---
dlls/kernel32/thread.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5b9a683..0abfdf1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -607,7 +607,7 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret");
-#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__APPLE__)
/*********************************************************************** * SetLastError (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 5ac55b7..3055d5f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2783,7 +2783,7 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest )
/* A few optimizations for gcc */
-#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__APPLE__))) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2)))
static FORCEINLINE DWORD WINAPI GetLastError(void) {