summaryrefslogtreecommitdiffstats
path: root/Mac/Modules/fm
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-11-19 16:13:35 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-11-19 16:13:35 (GMT)
commite48cef7aba0993ca6d01579f62900f0596960885 (patch)
tree008187dc4bba4fdd74ebca680bdef67e589527e9 /Mac/Modules/fm
parent10d176f77e04ad95c3e501f8b65a0b9ad931a098 (diff)
downloadcpython-e48cef7aba0993ca6d01579f62900f0596960885.zip
cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.gz
cpython-e48cef7aba0993ca6d01579f62900f0596960885.tar.bz2
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
Diffstat (limited to 'Mac/Modules/fm')
-rw-r--r--Mac/Modules/fm/_Fmmodule.c10
-rw-r--r--Mac/Modules/fm/fmsupport.py4
2 files changed, 3 insertions, 11 deletions
diff --git a/Mac/Modules/fm/_Fmmodule.c b/Mac/Modules/fm/_Fmmodule.c
index 095fe3a..cba96e0 100644
--- a/Mac/Modules/fm/_Fmmodule.c
+++ b/Mac/Modules/fm/_Fmmodule.c
@@ -14,17 +14,13 @@
/* Macro to test whether a weak-loaded CFM function exists */
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
- PyErr_SetString(PyExc_NotImplementedError, \
- "Not available in this shared library/OS version"); \
- return NULL; \
+ PyErr_SetString(PyExc_NotImplementedError, \
+ "Not available in this shared library/OS version"); \
+ return NULL; \
}} while(0)
-#ifdef WITHOUT_FRAMEWORKS
-#include <Fonts.h>
-#else
#include <Carbon/Carbon.h>
-#endif
/*
diff --git a/Mac/Modules/fm/fmsupport.py b/Mac/Modules/fm/fmsupport.py
index 20ae292..07b944e 100644
--- a/Mac/Modules/fm/fmsupport.py
+++ b/Mac/Modules/fm/fmsupport.py
@@ -26,11 +26,7 @@ TextBuffer = RevVarInputBufferType()
includestuff = includestuff + """
-#ifdef WITHOUT_FRAMEWORKS
-#include <Fonts.h>
-#else
#include <Carbon/Carbon.h>
-#endif
/*