summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/ae
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-11-30 14:16:36 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-11-30 14:16:36 (GMT)
commitb3be216b41a4755556a887baa6ab440279fbe1dc (patch)
treef7b1e40f24563a9800d31b517cac615c991b0d09 /Mac/Modules/ae
parent69b83b113f9e6fed321288ea23bca2aa673a7beb (diff)
downloadcpython-b3be216b41a4755556a887baa6ab440279fbe1dc.zip
cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.gz
cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.bz2
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
Diffstat (limited to 'Mac/Modules/ae')
-rw-r--r--Mac/Modules/ae/_AEmodule.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/Mac/Modules/ae/_AEmodule.c b/Mac/Modules/ae/_AEmodule.c
index b6e3c48..537388e 100644
--- a/Mac/Modules/ae/_AEmodule.c
+++ b/Mac/Modules/ae/_AEmodule.c
@@ -5,12 +5,8 @@
-#ifdef _WIN32
-#include "pywintoolbox.h"
-#else
#include "macglue.h"
#include "pymactoolbox.h"
-#endif
/* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
@@ -784,7 +780,7 @@ static PyObject *AEDesc_getattr(AEDescObject *self, char *name)
#define AEDesc_hash NULL
PyTypeObject AEDesc_Type = {
- PyObject_HEAD_INIT(&PyType_Type)
+ PyObject_HEAD_INIT(NULL)
0, /*ob_size*/
"AEDesc", /*tp_name*/
sizeof(AEDescObject), /*tp_basicsize*/