[Python-checkins] python/dist/src/Mac/Modules/waste wastemodule.c, 1.31, 1.32 wastescan.py, 1.13, 1.14

[jackjansen at users.sourceforge.net]

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

Modified Files:
	wastemodule.c wastescan.py 
Log Message:
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.


Index: wastemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastemodule.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wastemodule.c	23 Dec 2002 23:16:25 -0000	1.31
--- wastemodule.c	20 Nov 2003 13:30:59 -0000	1.32
***************
*** 6,21 ****
  
  
- #ifdef _WIN32
- #include "pywintoolbox.h"
- #else
- #include "macglue.h"
  #include "pymactoolbox.h"
- #endif
  
  /* 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)
  
--- 6,16 ----
  
  
  #include "pymactoolbox.h"
  
  /* 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,30 ****
  #include <WEObjectHandlers.h>
  #include <WETabs.h>
- #ifndef PyDoc_STR
- #define PyDoc_STR(x) (x)
- #endif
  
  /* Exported by Qdmodule.c: */
--- 19,22 ----

Index: wastescan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastescan.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wastescan.py	21 Feb 2003 22:11:45 -0000	1.13
--- wastescan.py	20 Nov 2003 13:30:59 -0000	1.14
***************
*** 7,11 ****
  from scantools import Scanner
  
! WASTEDIR='/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/MacOS Support/(Third Party Support)/Waste 2.0 Distribution/C_C++ Headers/'
  		
  if not os.path.exists(WASTEDIR):
--- 7,11 ----
  from scantools import Scanner
  
! WASTEDIR='/Users/jack/src/waste/C_C++ Headers/'
  		
  if not os.path.exists(WASTEDIR):