Got rid of obsolete HAVE_UNIVERSAL_HEADERS test and SystemSevenOrLater define.

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index fc014d5f30f82c48baacfb5fdbd5b64b43e4836c..e7e64386de618cc56e349485025ccb1ce8c071cf 100644 (file)
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -22,10 +22,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#ifndef SystemSevenOrLater
-#define SystemSevenOrLater 1
-#endif
-
 #include <Types.h>
 #include <Files.h>
 #include <Events.h>
@@ -45,10 +41,6 @@ typedef struct {
 } PyMacSchedParams;
 
 
-#ifdef GENERATINGCFM                           /* Defined to 0 or 1 in Universal headers */
-#define HAVE_UNIVERSAL_HEADERS
-#endif
-
 #ifdef USE_GUSI1
 void PyMac_FixGUSIcd(void);            /* Workaround for GUSI chdir() call */
 extern void PyMac_SetGUSISpin(void);           /* Install our private GUSI spin routine */

diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c
index 435560a587c54a514be984bfe77cf7714f827bad..ab07544c0e3ea17f1a0cd396385c30f7b2ff443c 100644 (file)
--- a/Mac/Modules/ae/AEmodule.c
+++ b/Mac/Modules/ae/AEmodule.c
@@ -10,28 +10,6 @@
 
 #include <AppleEvents.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define AEIdleProcPtr IdleProcPtr
-#define AEFilterProcPtr EventFilterProcPtr
-#define AEEventHandlerProcPtr EventHandlerProcPtr
-#endif
-
-#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
-** - for each routine we pass we declare a upp_xxx that
-**   we initialize to the correct value in the init routine.
-*/
-#define AEIdleUPP AEIdleProcPtr
-#define AEFilterUPP AEFilterProcPtr
-#define AEEventHandlerUPP AEEventHandlerProcPtr
-#define NewAEIdleProc(x) (x)
-#define NewAEFilterProc(x) (x)
-#define NewAEEventHandlerProc(x) (x)
-#endif
-
 static pascal OSErr GenericEventHandler(); /* Forward */
 
 AEEventHandlerUPP upp_GenericEventHandler;

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index 9423312b04f4979ee593505309af82ca787eb3a9..9931f9db9824bb6e8b3ea564614e6862a7155e64 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -84,28 +84,6 @@ AEMethod = OSErrMethodGenerator
 includestuff = includestuff + """
 #include <AppleEvents.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define AEIdleProcPtr IdleProcPtr
-#define AEFilterProcPtr EventFilterProcPtr
-#define AEEventHandlerProcPtr EventHandlerProcPtr
-#endif
-
-#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
-** - for each routine we pass we declare a upp_xxx that
-**   we initialize to the correct value in the init routine.
-*/
-#define AEIdleUPP AEIdleProcPtr
-#define AEFilterUPP AEFilterProcPtr
-#define AEEventHandlerUPP AEEventHandlerProcPtr
-#define NewAEIdleProc(x) (x)
-#define NewAEFilterProc(x) (x)
-#define NewAEEventHandlerProc(x) (x)
-#endif
-
 static pascal OSErr GenericEventHandler(); /* Forward */
 
 AEEventHandlerUPP upp_GenericEventHandler;

diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c
index d95cc990b8885b831efce757837895c22b82e931..dea35b76b8cc92ba4d4a5d64e65ef1c100b1536f 100644 (file)
--- a/Mac/Modules/ctbmodule.c
+++ b/Mac/Modules/ctbmodule.c
@@ -36,12 +36,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <ToolUtils.h>
 #include <OSUtils.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define ConnectionCompletionUPP ProcPtr
-#define ConnectionChooseIdleUPP ProcPtr
-#define NewConnectionCompletionProc(x) (x)
-#define NewConnectionChooseIdleProc(x) (x)
-#endif
 
 #define        _UnimplementedToolTrap  0xA89F
 #define        _CommToolboxTrap                0x8B

diff --git a/Mac/Modules/dlg/Dlgmodule.c b/Mac/Modules/dlg/Dlgmodule.c
index 827f7eb57fec722d526960ff40aeece12a2f4471..33ce3909999c78442ec88cea81535af5447a1d68 100644 (file)
--- a/Mac/Modules/dlg/Dlgmodule.c
+++ b/Mac/Modules/dlg/Dlgmodule.c
@@ -10,10 +10,6 @@
 
 #include <Dialogs.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define NewModalFilterProc(x) (x)
-#endif
-
 /* XXX Shouldn't this be a stack? */
 static PyObject *Dlg_FilterProc_callback = NULL;
 

diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py
index f5b86f5656b3d11949b748e5f1adbd4e7fe6d86a..bcf82ffc48e0264ee02f15ed2916c5dc6361bf93 100644 (file)
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -31,10 +31,6 @@ EventMask = Type("EventMask", "H")
 includestuff = includestuff + """
 #include <Dialogs.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define NewModalFilterProc(x) (x)
-#endif
-
 /* XXX Shouldn't this be a stack? */
 static PyObject *Dlg_FilterProc_callback = NULL;
 

diff --git a/Mac/Modules/scrap/Scrapmodule.c b/Mac/Modules/scrap/Scrapmodule.c
index 5dd5c5ab4d03308b556ee5706297faf67fff7d19..4dfb4cd23b460a82930ac22edc4f8ec1f992c1a6 100644 (file)
--- a/Mac/Modules/scrap/Scrapmodule.c
+++ b/Mac/Modules/scrap/Scrapmodule.c
@@ -2,11 +2,6 @@
 /* ========================== Module Scrap ========================== */
 
 #include "Python.h"
-
-
-
-#define SystemSevenOrLater 1
-
 #include "macglue.h"
 #include <Memory.h>
 #include <Dialogs.h>

diff --git a/Mac/Modules/snd/Sndmodule.c b/Mac/Modules/snd/Sndmodule.c
index d230c2bbde2bb28c10c7cc4f710377ce10692974..daa0090572bb06299415f3fcf0669e9c0fc7690e 100644 (file)
--- a/Mac/Modules/snd/Sndmodule.c
+++ b/Mac/Modules/snd/Sndmodule.c
@@ -10,12 +10,6 @@
 
 #include <Sound.h>
 
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define SndCallBackUPP ProcPtr
-#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x))
-#define SndListHandle Handle
-#endif
-
 #include <OSUtils.h> /* for Set(Current)A5 */
 
 /* Create a SndCommand object (an (int, int, int) tuple) */

diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index 1f2fdea119237d1b1b2e949e29c66caee626a002..730e3811f98e9e9a60bf9c804813a855af88f506 100644 (file)
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -18,12 +18,6 @@ class SndMethod(SndMixIn, OSErrMethodGenerator): pass
 
 includestuff = includestuff + """
 #include <Sound.h>
-
-#ifndef HAVE_UNIVERSAL_HEADERS
-#define SndCallBackUPP ProcPtr
-#define NewSndCallBackProc(x) ((SndCallBackProcPtr)(x))
-#define SndListHandle Handle
-#endif
 """
 
 initstuff = initstuff + """