[Python-checkins] python/dist/src/Mac/Modules/help _Helpmodule.c, 1.8, 1.9 helpsupport.py, 1.9, 1.10

Wed Nov 19 11:13:59 EST 2003

Update of /cvsroot/python/python/dist/src/Mac/Modules/help
In directory sc8-pr-cvs1:/tmp/cvs-serv27894/Mac/Modules/help
Modified Files:
	_Helpmodule.c helpsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.
Index: _Helpmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/help/_Helpmodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _Helpmodule.c	18 Nov 2002 15:26:38 -0000	1.8
--- _Helpmodule.c	19 Nov 2003 16:13:27 -0000	1.9
***************
*** 15,21 ****
 /* 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)
 
--- 15,21 ----
 /* 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)
 
***************
*** 24,32 ****
 #define PyDoc_STR(x) (x)
 #endif
- #ifdef WITHOUT_FRAMEWORKS
- #include <MacHelp.h>
- #else
 #include <Carbon/Carbon.h>
- #endif
 
 static PyObject *Help_Error;
--- 24,28 ----
Index: helpsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/help/helpsupport.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** helpsupport.py	3 Dec 2002 23:40:20 -0000	1.9
--- helpsupport.py	19 Nov 2003 16:13:27 -0000	1.10
***************
*** 40,48 ****
 #define PyDoc_STR(x) (x)
 #endif
- #ifdef WITHOUT_FRAMEWORKS
- #include <MacHelp.h>
- #else
 #include <Carbon/Carbon.h>
- #endif
 """
 
--- 40,44 ----