diff options
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Modules/fm/_Fmmodule.c | 8 | ||||
| -rw-r--r-- | Mac/Modules/qd/_Qdmodule.c | 12 | ||||
| -rw-r--r-- | Mac/Modules/qdoffs/_Qdoffsmodule.c | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Mac/Modules/fm/_Fmmodule.c b/Mac/Modules/fm/_Fmmodule.c index adc47aa250..c516f2467c 100644 --- a/Mac/Modules/fm/_Fmmodule.c +++ b/Mac/Modules/fm/_Fmmodule.c @@ -2,8 +2,9 @@ /* =========================== Module _Fm =========================== */ #include "Python.h" +#include <Carbon/Carbon.h> -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) #include "pymactoolbox.h" @@ -16,7 +17,6 @@ }} while(0) -#include <Carbon/Carbon.h> /* @@ -347,7 +347,7 @@ static PyMethodDef Fm_methods[] = { void init_Fm(void) { PyObject *m; -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) PyObject *d; #endif /* __LP64__ */ @@ -355,7 +355,7 @@ void init_Fm(void) m = Py_InitModule("_Fm", Fm_methods); -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) d = PyModule_GetDict(m); Fm_Error = PyMac_GetOSErrException(); if (Fm_Error == NULL || diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c index c7594b9a73..d21f36100f 100644 --- a/Mac/Modules/qd/_Qdmodule.c +++ b/Mac/Modules/qd/_Qdmodule.c @@ -3,8 +3,9 @@ #include "Python.h" +#include <Carbon/Carbon.h> -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) #include "pymactoolbox.h" @@ -16,7 +17,6 @@ }} while(0) -#include <Carbon/Carbon.h> #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GrafObj_New(GrafPtr); @@ -6548,7 +6548,7 @@ static PyObject *Qd_RawBitMap(PyObject *_self, PyObject *_args) #endif /* __LP64__ */ static PyMethodDef Qd_methods[] = { -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) {"GetPort", (PyCFunction)Qd_GetPort, 1, PyDoc_STR("() -> (GrafPtr port)")}, {"GrafDevice", (PyCFunction)Qd_GrafDevice, 1, @@ -7088,7 +7088,7 @@ static PyMethodDef Qd_methods[] = { }; -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) /* Like BMObj_New, but the original bitmap data structure is copied (and ** released when the object is released) @@ -7112,7 +7112,7 @@ PyObject *BMObj_NewCopied(BitMapPtr itself) void init_Qd(void) { PyObject *m; -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) PyObject *d; @@ -7127,7 +7127,7 @@ void init_Qd(void) #endif /* __LP64__ */ m = Py_InitModule("_Qd", Qd_methods); -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) d = PyModule_GetDict(m); Qd_Error = PyMac_GetOSErrException(); if (Qd_Error == NULL || diff --git a/Mac/Modules/qdoffs/_Qdoffsmodule.c b/Mac/Modules/qdoffs/_Qdoffsmodule.c index 686eca45f7..e5562cb72f 100644 --- a/Mac/Modules/qdoffs/_Qdoffsmodule.c +++ b/Mac/Modules/qdoffs/_Qdoffsmodule.c @@ -4,7 +4,8 @@ #include "Python.h" -#ifndef __LP64__ +#include <Carbon/Carbon.h> +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) #include "pymactoolbox.h" @@ -16,7 +17,6 @@ }} while(0) -#include <Carbon/Carbon.h> #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_GWorldObj_New(GWorldPtr); @@ -634,7 +634,7 @@ static PyObject *Qdoffs_PutPixMapBytes(PyObject *_self, PyObject *_args) #endif /* __LP64__ */ static PyMethodDef Qdoffs_methods[] = { -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) {"NewGWorld", (PyCFunction)Qdoffs_NewGWorld, 1, PyDoc_STR("(short PixelDepth, Rect boundsRect, CTabHandle cTable, GDHandle aGDevice, GWorldFlags flags) -> (GWorldPtr offscreenGWorld)")}, {"LockPixels", (PyCFunction)Qdoffs_LockPixels, 1, @@ -691,7 +691,7 @@ static PyMethodDef Qdoffs_methods[] = { void init_Qdoffs(void) { PyObject *m; -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) PyObject *d; @@ -702,7 +702,7 @@ void init_Qdoffs(void) #endif /* __LP64__ */ m = Py_InitModule("_Qdoffs", Qdoffs_methods); -#ifndef __LP64__ +#if !defined(__LP64__) && !defined(MAC_OS_X_VERSION_10_7) d = PyModule_GetDict(m); Qdoffs_Error = PyMac_GetOSErrException(); if (Qdoffs_Error == NULL || |