Mac OS X flag change __darwin__ to __APPLE__

Pierre d'Herbemont stegefin at free.fr
Sun Jul 13 12:55:55 CDT 2003


Hi!

I previously used __darwin__ as the Darwin detection flag. But it 
wasn't the right one. GCC has a special flag for Mac OS X/Darwin which 
is __APPLE__. So here is the modification.

ChangeLog:
- Change __darwin__ flag to __APPLE__ flag.

-------------- next part --------------
Index: include/winnt.h
===================================================================
RCS file: /home/wine/wine/include/winnt.h,v
retrieving revision 1.160
diff -u -r1.160 winnt.h
--- include/winnt.h	30 Jun 2003 18:28:08 -0000	1.160
+++ include/winnt.h	13 Jul 2003 17:52:26 -0000
@@ -1637,7 +1637,7 @@
 extern inline struct _TEB * WINAPI NtCurrentTeb(void)
 {
     struct _TEB *teb;
-# ifdef __darwin__
+# ifdef __APPLE__
     __asm__("\tmr %0, r13" : "=r" (teb));
 # else
     __asm__("\tmr %0, 2" : "=r" (teb));
Index: dlls/ntdll/signal_powerpc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_powerpc.c,v
retrieving revision 1.15
diff -u -r1.15 signal_powerpc.c
--- dlls/ntdll/signal_powerpc.c	30 Jun 2003 21:00:17 -0000	1.15
+++ dlls/ntdll/signal_powerpc.c	13 Jul 2003 17:52:27 -0000
@@ -101,7 +101,7 @@
 
 #endif /* linux */
 
-#ifdef __darwin__
+#ifdef __APPLE__
 
 # include <sys/ucontext.h>
 
@@ -159,7 +159,7 @@
 SIGFPE
 */
 
-#endif /* __darwin__ */
+#endif /* __APPLE__ */
 
 
 


More information about the wine-patches mailing list