diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
| commit | b3be216b41a4755556a887baa6ab440279fbe1dc (patch) | |
| tree | f7b1e40f24563a9800d31b517cac615c991b0d09 /Mac/Modules/waste | |
| parent | 69b83b113f9e6fed321288ea23bca2aa673a7beb (diff) | |
| download | cpython-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/waste')
| -rw-r--r-- | Mac/Modules/waste/wastemodule.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c index 2c28310..921f297 100644 --- a/Mac/Modules/waste/wastemodule.c +++ b/Mac/Modules/waste/wastemodule.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 ) {\ @@ -348,7 +344,7 @@ static PyObject *WEOObj_getattr(WEOObject *self, char *name) #define WEOObj_hash NULL PyTypeObject WEO_Type = { - PyObject_HEAD_INIT(&PyType_Type) + PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ "WEO", /*tp_name*/ sizeof(WEOObject), /*tp_basicsize*/ @@ -1713,7 +1709,7 @@ static PyObject *wasteObj_getattr(wasteObject *self, char *name) #define wasteObj_hash NULL PyTypeObject waste_Type = { - PyObject_HEAD_INIT(&PyType_Type) + PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ "waste", /*tp_name*/ sizeof(wasteObject), /*tp_basicsize*/ |