[Python-checkins] python/dist/src/Mac/Modules/app _Appmodule.c, 1.17, 1.18 appsupport.py, 1.17, 1.18

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/app
In directory sc8-pr-cvs1:/tmp/cvs-serv27894/Mac/Modules/app

Modified Files:
	_Appmodule.c appsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.


Index: _Appmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/_Appmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** _Appmodule.c	23 Dec 2002 23:16:20 -0000	1.17
--- _Appmodule.c	19 Nov 2003 16:13:23 -0000	1.18
***************
*** 15,30 ****
  /* 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 <Appearance.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: appsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/app/appsupport.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** appsupport.py	3 Dec 2002 23:40:19 -0000	1.17
--- appsupport.py	19 Nov 2003 16:13:23 -0000	1.18
***************
*** 80,89 ****
  
  includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Appearance.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
- 
  
  
--- 80,84 ----