[Python-checkins] CVS: python/dist/src/Mac/Modules/waste wastemodule.c,1.17,1.18

2001年9月05日 08:42:55 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules/waste
In directory usw-pr-cvs1:/tmp/cvs-serv31037/python/Mac/Modules/waste
Modified Files:
	wastemodule.c 
Log Message:
A few more gcc warnings bite the dust.
Index: wastemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/waste/wastemodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wastemodule.c	2001年06月20日 21:21:02	1.17
--- wastemodule.c	2001年09月05日 15:42:53	1.18
***************
*** 6,12 ****
--- 6,24 ----
 
 
+ #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)
+ 
+ 
 #include <WASTE.h>
 #include <WEObjectHandlers.h>
***************
*** 214,218 ****
 	return (PyObject *)it;
 }
! WEOObj_Convert(PyObject *v, WEObjectReference *p_itself)
 {
 	if (!WEOObj_Check(v))
--- 226,230 ----
 	return (PyObject *)it;
 }
! int WEOObj_Convert(PyObject *v, WEObjectReference *p_itself)
 {
 	if (!WEOObj_Check(v))
***************
*** 382,386 ****
 	return (PyObject *)it;
 }
! wasteObj_Convert(PyObject *v, WEReference *p_itself)
 {
 	if (!wasteObj_Check(v))
--- 394,398 ----
 	return (PyObject *)it;
 }
! int wasteObj_Convert(PyObject *v, WEReference *p_itself)
 {
 	if (!wasteObj_Check(v))
***************
*** 1062,1066 ****
 	Py_INCREF(Py_None);
 	_res = Py_None;
- pText__error__: ;
 	return _res;
 }
--- 1074,1077 ----