[Python-checkins] python/dist/src/Mac/Modules/icn _Icnmodule.c, 1.7, 1.8 icnsupport.py, 1.9, 1.10

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_Icnmodule.c icnsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.


Index: _Icnmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icn/_Icnmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _Icnmodule.c	12 Dec 2002 10:31:51 -0000	1.7
--- _Icnmodule.c	19 Nov 2003 16:13:28 -0000	1.8
***************
*** 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 <Icons.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: icnsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icn/icnsupport.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** icnsupport.py	3 Dec 2002 23:40:20 -0000	1.9
--- icnsupport.py	19 Nov 2003 16:13:29 -0000	1.10
***************
*** 47,55 ****
  
  includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Icons.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  """
--- 47,51 ----