diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 22:34:56 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 22:34:56 (GMT) |
| commit | 0268ac80de8f6214da10ea430c53321352c8c183 (patch) | |
| tree | 5ecdb4d8660941343fface22ecac19954d745767 | |
| parent | b8e76a7b3dbc4d784b1365efe6811505583bbc53 (diff) | |
| download | cpython-0268ac80de8f6214da10ea430c53321352c8c183.zip cpython-0268ac80de8f6214da10ea430c53321352c8c183.tar.gz cpython-0268ac80de8f6214da10ea430c53321352c8c183.tar.bz2 | |
Include Carbon/Carbon.h if appropriate.
Fixed glue initialization code so prototype is correct.
| -rw-r--r-- | Mac/Include/pymactoolbox.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Mac/Include/pymactoolbox.h b/Mac/Include/pymactoolbox.h index fca673d..c4a56da 100644 --- a/Mac/Include/pymactoolbox.h +++ b/Mac/Include/pymactoolbox.h @@ -25,12 +25,12 @@ ** These macros are used in the module init code. If we use toolbox object glue ** it sets the function pointer to point to the real function. */ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(rtn) { \ +#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \ extern PyObject *(*PyMacGluePtr_##rtn)(object); \ PyMacGluePtr_##rtn = _##rtn; \ } -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(rtn) { \ - extern int (*PyMacGluePtr_##rtn)(object); \ +#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \ + extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \ PyMacGluePtr_##rtn = _##rtn; \ } #else @@ -38,8 +38,8 @@ ** If we don't use toolbox object glue the init macros are empty. Moreover, we define ** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included. */ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(rtn) -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(rtn) +#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) +#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) #endif /* USE_TOOLBOX_OBJECT_GLUE */ /* AE exports */ |