commit 0d16a7bbe4b4ab510dfb68e267109418ca9f2ea5
author Alexandre Julliard <julliard@winehq.org> Mon Mar 12 16:14:18 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 12 16:14:18 2007 +0100
tree f08eed717674d796d52b1554e8927f5a75178370
parent a2808903b184be88c445173cd713a24f2f1ab58e

Fixed some compilation issues on Mac OS X Leopard.

server/mach.c

diff --git a/server/mach.c b/server/mach.c
index 5996ba4..4e643ce 100644
--- a/server/mach.c
+++ b/server/mach.c
@@ -162,7 +162,8 @@
 /* retrieve the thread x86 registers */
 void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags )
 {
-    struct x86_debug_state32 state;
+#ifdef __i386__
+    x86_debug_state32_t state;
     mach_msg_type_number_t count = sizeof(state) / sizeof(int);
     mach_msg_type_name_t type;
     mach_port_t port, process_port = get_process_port( thread->process );
@@ -180,21 +181,33 @@
 
     if (!thread_get_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, &count ))
     {
+/* work around silly renaming of struct members in OS X 10.5 */
+#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32)
+        context->Dr0 = state.__dr0;
+        context->Dr1 = state.__dr1;
+        context->Dr2 = state.__dr2;
+        context->Dr3 = state.__dr3;
+        context->Dr6 = state.__dr6;
+        context->Dr7 = state.__dr7;
+#else
         context->Dr0 = state.dr0;
         context->Dr1 = state.dr1;
         context->Dr2 = state.dr2;
         context->Dr3 = state.dr3;
         context->Dr6 = state.dr6;
         context->Dr7 = state.dr7;
+#endif
         context->ContextFlags |= CONTEXT_DEBUG_REGISTERS;
     }
     mach_port_deallocate( mach_task_self(), port );
+#endif
 }
 
 /* set the thread x86 registers */
 void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags )
 {
-    struct x86_debug_state32 state;
+#ifdef __i386__
+    x86_debug_state32_t state;
     mach_msg_type_number_t count = sizeof(state) / sizeof(int);
     mach_msg_type_name_t type;
     mach_port_t port, process_port = get_process_port( thread->process );
@@ -210,6 +223,16 @@
         return;
     }
 
+#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32)
+    state.__dr0 = context->Dr0;
+    state.__dr1 = context->Dr1;
+    state.__dr2 = context->Dr2;
+    state.__dr3 = context->Dr3;
+    state.__dr4 = 0;
+    state.__dr5 = 0;
+    state.__dr6 = context->Dr6;
+    state.__dr7 = context->Dr7;
+#else
     state.dr0 = context->Dr0;
     state.dr1 = context->Dr1;
     state.dr2 = context->Dr2;
@@ -218,6 +241,7 @@
     state.dr5 = 0;
     state.dr6 = context->Dr6;
     state.dr7 = context->Dr7;
+#endif
     if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count ))
     {
         if (thread->context)  /* update the cached values */
@@ -231,6 +255,7 @@
         }
     }
     mach_port_deallocate( mach_task_self(), port );
+#endif
 }
 
 int send_thread_signal( struct thread *thread, int sig )