mirror of https://github.com/python/cpython
Got rid of obsolete HAVE_UNIVERSAL_HEADERS test and SystemSevenOrLater define.
This commit is contained in:
Jack Jansen
parent
74a1e63a89
commit
a44923fbfe
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,6 @@
|
|||
/* ========================== Module Scrap ========================== */
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
|
||||
|
||||
#define SystemSevenOrLater 1
|
||||
|
||||
#include "macglue.h"
|
||||
#include <Memory.h>
|
||||
#include <Dialogs.h>
|
||||
|
|
|
|||
|
|
@ -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) */
|
||||
|
|
|
|||
|
|
@ -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 + """
|
||||
|
|
|
|||
Loading…
Reference in New Issue