diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-05 16:16:39 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-05 16:16:39 (GMT) |
| commit | bd008844156384108a71423005911e37c0ca5395 (patch) | |
| tree | e17e51b58c53b11d28b8e2f4379746a9ce2d7bc2 /Mac/Modules/win | |
| parent | 34cbe718d463fce6a335477081b18852676fb7e1 (diff) | |
| download | cpython-bd008844156384108a71423005911e37c0ca5395.zip cpython-bd008844156384108a71423005911e37c0ca5395.tar.gz cpython-bd008844156384108a71423005911e37c0ca5395.tar.bz2 | |
First tweaks to allow MacPython to be compiled with
Universal Headers 3.4
Diffstat (limited to 'Mac/Modules/win')
| -rw-r--r-- | Mac/Modules/win/_Winmodule.c | 4 | ||||
| -rw-r--r-- | Mac/Modules/win/winsupport.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Mac/Modules/win/_Winmodule.c b/Mac/Modules/win/_Winmodule.c index 13ebe20..623782d 100644 --- a/Mac/Modules/win/_Winmodule.c +++ b/Mac/Modules/win/_Winmodule.c @@ -36,11 +36,13 @@ extern int _WinObj_Convert(PyObject *, WindowRef *); #define WinObj_Convert _WinObj_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS +#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340 /* Carbon calls that we emulate in classic mode */ #define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag) #define GetWindowFromPort(port) ((WindowRef)(port)) #define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect) +#endif +#if !ACCESSOR_CALLS_ARE_FUNCTIONS #define IsPointerValid(p) (((long)p&3) == 0) #endif #if ACCESSOR_CALLS_ARE_FUNCTIONS diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py index 8a38b97..29afcc6 100644 --- a/Mac/Modules/win/winsupport.py +++ b/Mac/Modules/win/winsupport.py @@ -70,11 +70,13 @@ extern int _WinObj_Convert(PyObject *, WindowRef *); #define WinObj_Convert _WinObj_Convert #endif -#if !ACCESSOR_CALLS_ARE_FUNCTIONS +#if !ACCESSOR_CALLS_ARE_FUNCTIONS && UNIVERSAL_INTERFACES_VERSION < 0x340 /* Carbon calls that we emulate in classic mode */ #define GetWindowSpareFlag(win) (((CWindowPeek)(win))->spareFlag) #define GetWindowFromPort(port) ((WindowRef)(port)) #define GetWindowPortBounds(win, rectp) (*(rectp) = ((CWindowPeek)(win))->port.portRect) +#endif +#if !ACCESSOR_CALLS_ARE_FUNCTIONS #define IsPointerValid(p) (((long)p&3) == 0) #endif #if ACCESSOR_CALLS_ARE_FUNCTIONS |