[Python-checkins] CVS: python/dist/src/Mac/Modules/res _Resmodule.c,1.2,1.3

2001年9月05日 03:29:29 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules/res
In directory usw-pr-cvs1:/tmp/cvs-serv11277/python/Mac/Modules/res
Modified Files:
	_Resmodule.c 
Log Message:
Shut up many more gcc warnings.
Index: _Resmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/res/_Resmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _Resmodule.c	2001年09月04日 22:17:16	1.2
--- _Resmodule.c	2001年09月05日 10:29:27	1.3
***************
*** 6,11 ****
--- 6,15 ----
 
 
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
 #include "macglue.h"
 #include "pymactoolbox.h"
+ #endif
 
 /* Macro to test whether a weak-loaded CFM function exists */
***************
*** 395,399 ****
 	PyObject *_res = NULL;
 
! 	return CtlObj_New((ControlHandle)_self->ob_itself);
 
 }
--- 399,404 ----
 	PyObject *_res = NULL;
 
! 	_res = CtlObj_New((ControlHandle)_self->ob_itself);
! 	return _res;
 
 }
***************
*** 403,407 ****
 	PyObject *_res = NULL;
 
! 	return MenuObj_New((MenuHandle)_self->ob_itself);
 
 }
--- 408,413 ----
 	PyObject *_res = NULL;
 
! 	_res = MenuObj_New((MenuHandle)_self->ob_itself);
! 	return _res;
 
 }
***************
*** 1534,1538 ****
 }
 
! OptResObj_Convert(PyObject *v, Handle *p_itself)
 {
 	PyObject *tmp;
--- 1540,1544 ----
 }
 
! int OptResObj_Convert(PyObject *v, Handle *p_itself)
 {
 	PyObject *tmp;