diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-19 12:34:59 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-19 12:34:59 (GMT) |
| commit | 6143d533b682dbfe38474ae8858741b3eecd8c91 (patch) | |
| tree | d136af7f3ba8f2e57cbeb6910fb9edf4e3d263a5 /Mac/Modules/icgluemodule.c | |
| parent | 9f66b4af6a02cd185738f0cdb28336151c928056 (diff) | |
| download | cpython-6143d533b682dbfe38474ae8858741b3eecd8c91.zip cpython-6143d533b682dbfe38474ae8858741b3eecd8c91.tar.gz cpython-6143d533b682dbfe38474ae8858741b3eecd8c91.tar.bz2 | |
Include Carbon/Carbon.h in stead of universal headers, if appropriate.
Test for TARGET_API_MAC_OS8 in stead of !TARGET_API_MAC_CARBON where
appropriate.
Diffstat (limited to 'Mac/Modules/icgluemodule.c')
| -rw-r--r-- | Mac/Modules/icgluemodule.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c index b617439..bd616db 100644 --- a/Mac/Modules/icgluemodule.c +++ b/Mac/Modules/icgluemodule.c @@ -34,16 +34,29 @@ PERFORMANCE OF THIS SOFTWARE. extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */ -#if TARGET_API_MAC_CARBON +#ifdef WITHOUT_FRAMEWORKS +#if !TARGET_API_MAC_OS8 /* The Carbon headers define PRAGMA_ALIGN_SUPPORT to something illegal, ** because you shouldn't use it for Carbon. All good and well, but portable ** code still needs it. So, we undefine it here. */ #undef PRAGMA_ALIGN_SUPPORTED #define PRAGMA_ALIGN_SUPPORTED 0 -#endif /* TARGET_API_MAC_CARBON */ +#endif /* !TARGET_API_MAC_OS8 */ #include "ICAPI.h" +#else +#include <Carbon/Carbon.h> +typedef OSStatus ICError; +/* Some fields in ICMapEntry have changed names. */ +#define file_type fileType +#define file_creator fileCreator +#define post_creator postCreator +#define creator_app_name creatorAppName +#define post_app_name postAppName +#define MIME_type MIMEType +#define entry_name entryName +#endif static PyObject *ErrorObject; @@ -69,7 +82,7 @@ staticforward PyTypeObject Icitype; /* ---------------------------------------------------------------- */ -#if !TARGET_API_MAC_CARBON +#if TARGET_API_MAC_OS8 static char ici_ICFindConfigFile__doc__[] = "()->None; Find config file in standard places" ; @@ -129,8 +142,6 @@ ici_ICChooseConfig(self, args) Py_INCREF(Py_None); return Py_None; } -#endif /* !TARGET_API_MAC_CARBON */ - static char ici_ICChooseNewConfig__doc__[] = "()->None; Let the user choose a new config file" @@ -150,6 +161,7 @@ ici_ICChooseNewConfig(self, args) Py_INCREF(Py_None); return Py_None; } +#endif /* TARGET_API_MAC_OS8 */ static char ici_ICGetSeed__doc__[] = @@ -460,12 +472,12 @@ ici_ICMapTypeCreator(self, args) static struct PyMethodDef ici_methods[] = { -#if !TARGET_API_MAC_CARBON +#if TARGET_API_MAC_OS8 {"ICFindConfigFile", (PyCFunction)ici_ICFindConfigFile, METH_VARARGS, ici_ICFindConfigFile__doc__}, {"ICFindUserConfigFile", (PyCFunction)ici_ICFindUserConfigFile, METH_VARARGS, ici_ICFindUserConfigFile__doc__}, {"ICChooseConfig", (PyCFunction)ici_ICChooseConfig, METH_VARARGS, ici_ICChooseConfig__doc__}, {"ICChooseNewConfig", (PyCFunction)ici_ICChooseNewConfig, METH_VARARGS, ici_ICChooseNewConfig__doc__}, -#endif /* !TARGET_API_MAC_CARBON */ +#endif /* TARGET_API_MAC_OS8 */ {"ICGetSeed", (PyCFunction)ici_ICGetSeed, METH_VARARGS, ici_ICGetSeed__doc__}, {"ICBegin", (PyCFunction)ici_ICBegin, METH_VARARGS, ici_ICBegin__doc__}, {"ICFindPrefHandle", (PyCFunction)ici_ICFindPrefHandle, METH_VARARGS, ici_ICFindPrefHandle__doc__}, |