different #ifdefs

diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index f8c3c91f59a499bf64814f735c116e6dbce3e610..58b4d136b94932dc9eb979dc3fb3136845c3370a 100644 (file)
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -34,15 +34,14 @@ extern PyObject *WinObj_WhichWindow(WindowPtr);
 
 #include <AppleEvents.h>
 
-#ifdef THINK_C
+#ifndef HAVE_UNIVERSAL_HEADERS
 #define AEIdleProcPtr IdleProcPtr
 #define AEFilterProcPtr EventFilterProcPtr
 #define AEEventHandlerProcPtr EventHandlerProcPtr
 #endif
 
-#ifndef __MWERKS__
-/* Actually, this is "if not universal headers".
-** I'm trying to setup the code here so that is easily automated,
+#ifndef HAVE_UNIVERSAL_HEADERS
+/* I'm trying to setup the code here so that is easily automated,
 ** as follows:
 ** - Use the UPP in the source
 ** - for pre-universal headers, #define each UPP as the corresponding ProcPtr

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index eb1895601b1a1c0a54ff5960b6d30da6c6618485..3e636566f197ea4c9ff5e7ae6c5ce9f0a2fdb6d3 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -78,15 +78,14 @@ AEMethod = OSErrMethodGenerator
 includestuff = includestuff + """
 #include <AppleEvents.h>
 
-#ifdef THINK_C
+#ifndef HAVE_UNIVERSAL_HEADERS
 #define AEIdleProcPtr IdleProcPtr
 #define AEFilterProcPtr EventFilterProcPtr
 #define AEEventHandlerProcPtr EventHandlerProcPtr
 #endif
 
-#ifndef __MWERKS__
-/* Actually, this is "if not universal headers".
-** I'm trying to setup the code here so that is easily automated,
+#ifndef HAVE_UNIVERSAL_HEADERS
+/* I'm trying to setup the code here so that is easily automated,
 ** as follows:
 ** - Use the UPP in the source
 ** - for pre-universal headers, #define each UPP as the corresponding ProcPtr