[Python-checkins] python/dist/src/Mac/Modules/fm _Fmmodule.c, 1.8, 1.9 fmsupport.py, 1.6, 1.7

Wed Nov 19 11:13:59 EST 2003

Update of /cvsroot/python/python/dist/src/Mac/Modules/fm
In directory sc8-pr-cvs1:/tmp/cvs-serv27894/Mac/Modules/fm
Modified Files:
	_Fmmodule.c fmsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
Index: _Fmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/fm/_Fmmodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _Fmmodule.c	12 Dec 2002 10:31:50 -0000	1.8
--- _Fmmodule.c	19 Nov 2003 16:13:27 -0000	1.9
***************
*** 15,29 ****
 /* 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; \
 }} while(0)
 
 
- #ifdef WITHOUT_FRAMEWORKS
- #include <Fonts.h>
- #else
 #include <Carbon/Carbon.h>
- #endif
 
 
--- 15,25 ----
 /* 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; \
 }} while(0)
 
 
 #include <Carbon/Carbon.h>
 
 
Index: fmsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/fm/fmsupport.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fmsupport.py	25 Mar 2002 00:31:53 -0000	1.6
--- fmsupport.py	19 Nov 2003 16:13:27 -0000	1.7
***************
*** 27,35 ****
 
 includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Fonts.h>
- #else
 #include <Carbon/Carbon.h>
- #endif
 
 
--- 27,31 ----