mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
This commit is contained in:
parent
69b83b113f
commit
b3be216b41
53 changed files with 1815 additions and 300 deletions
|
@ -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*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue