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/res | |
| 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/res')
| -rw-r--r-- | Mac/Modules/res/_Resmodule.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c index 8640f5a..3d59641 100644 --- a/Mac/Modules/res/_Resmodule.c +++ b/Mac/Modules/res/_Resmodule.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 ) {\ @@ -550,7 +546,7 @@ ResObj_setattr(ResourceObject *self, char *name, PyObject *value) #define ResObj_hash NULL PyTypeObject Resource_Type = { - PyObject_HEAD_INIT(&PyType_Type) + PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ "Resource", /*tp_name*/ sizeof(ResourceObject), /*tp_basicsize*/ |