Change __PPC__ flag to __powerpc__

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


Hi!

I started to change the __PPC__ flags to the __powerpc__ flag.

Pierre.

ChangeLog:
- Change __PPC__ flags to __powerpc__
-------------- 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 19:51:36 -0000
@@ -805,7 +805,7 @@
 #endif  /* _MIPS_ */
 
 /* PowerPC context definitions */
-#ifdef __PPC__
+#ifdef __powerpc__
 
 #define CONTEXT_CONTROL         0x0001
 #define CONTEXT_FLOATING_POINT  0x0002
@@ -929,7 +929,7 @@
     DWORD Parameter7;
 } STACK_FRAME_HEADER,*PSTACK_FRAME_HEADER;
 
-#endif  /* __PPC__ */
+#endif  /* __powerpc__ */
 
 #ifdef __ALPHA__
 
@@ -1179,7 +1179,7 @@
 
 #endif /* __sparc__ */
 
-#ifdef __PPC__
+#ifdef __powerpc__
 
 /* FIXME: use getcontext() to retrieve full context */
 #define _GET_CONTEXT \
@@ -1204,7 +1204,7 @@
   void WINAPI name ( t1 a1, t2 a2, t3 a3, t4 a4 ) \
   { _GET_CONTEXT; fn( a1, a2, a3, a4, &context ); }
 
-#endif /* __PPC__ */
+#endif /* __powerpc__ */
 
 #ifdef __ALPHA__
 
@@ -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: include/rpc.h
===================================================================
RCS file: /home/wine/wine/include/rpc.h,v
retrieving revision 1.14
diff -u -r1.14 rpc.h
--- include/rpc.h	19 Apr 2003 20:06:58 -0000	1.14
+++ include/rpc.h	13 Jul 2003 19:51:36 -0000
@@ -25,8 +25,10 @@
 #ifndef __WINE_RPC_H
 #define __WINE_RPC_H
 
-#if defined(__PPC__) || defined(_MAC) /* ? */
+#if defined(__powerpc__) || defined(_MAC) /* ? */
  #define __RPC_MAC__
+ /* Also define __RPC_WIN32__ to ensure compatibility */
+ #define __RPC_WIN32__
 #elif defined(_WIN64)
  #define __RPC_WIN64__
 #else
Index: include/basetsd.h
===================================================================
RCS file: /home/wine/wine/include/basetsd.h,v
retrieving revision 1.11
diff -u -r1.11 basetsd.h
--- include/basetsd.h	16 Mar 2003 23:54:18 -0000	1.11
+++ include/basetsd.h	13 Jul 2003 19:51:36 -0000
@@ -131,7 +131,7 @@
 # define WORDS_BIGENDIAN
 # define BITFIELDS_BIGENDIAN
 # undef  ALLOW_UNALIGNED_ACCESS
-#elif defined(__PPC__)
+#elif defined(__powerpc__)
 # define WORDS_BIGENDIAN
 # define BITFIELDS_BIGENDIAN
 # undef  ALLOW_UNALIGNED_ACCESS


More information about the wine-patches mailing list