Ken Thomases : ntdll: Fix the Mac build with SDKs older than 10.14.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bed429133624a905170555a4ae526f4d72cc94dc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bed429133624a905170555a4ae526f4d72cc94dc

Author: Ken Thomases <ken at codeweavers.com>
Date:   Mon Sep 16 13:42:06 2019 -0500

ntdll: Fix the Mac build with SDKs older than 10.14.

Also, fix some warnings with the 10.14 SDK.
Thanks to Gijs Vermeulen for reporting the issue.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/signal_x86_64.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index e76e5be6aa..81ebe8c7e7 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -55,6 +55,9 @@
 # define UNW_LOCAL_ONLY
 # include <libunwind.h>
 #endif
+#ifdef __APPLE__
+# include <mach/mach.h>
+#endif
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
@@ -3209,10 +3212,10 @@ static void *mac_thread_gsbase(void)
     static int gsbase_offset = -1;
     void *ret;
 
-    kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_identifier_info_t) &tiinfo, &info_count);
+    kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count);
     if (kr == KERN_SUCCESS)
     {
-        TRACE("pthread_self() %p thread ID %lx gsbase %lx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle);
+        TRACE("pthread_self() %p thread ID %llx gsbase %llx\n", pthread_self(), tiinfo.thread_id, tiinfo.thread_handle);
         return (void*)tiinfo.thread_handle;
     }