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

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/ctl
In directory usw-pr-cvs1:/tmp/cvs-serv11785/python/Mac/Modules/ctl

Modified Files:
	_Ctlmodule.c 
Log Message:
Shut up many more gcc warnings.

Index: _Ctlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/_Ctlmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _Ctlmodule.c	2001/09/04 22:18:50	1.2
--- _Ctlmodule.c	2001/09/05 10:30:48	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 */
***************
*** 1677,1681 ****
  		return PyMac_Error(_err);
  	}
! 	return Py_BuildValue("O&", OptResObj_New, hdl);
  
  }
--- 1681,1686 ----
  		return PyMac_Error(_err);
  	}
! 	_res = Py_BuildValue("O&", OptResObj_New, hdl);
! 	return _res;
  
  }
***************
*** 2527,2530 ****
--- 2532,2536 ----
  	tracker = obj;
  	Py_INCREF(tracker);
+ 	return 1;
  }
  
***************
*** 2576,2580 ****
  			return -1;
  	/* And store the Python callback */
! 	sprintf(keybuf, "%x", which);
  	if (PyDict_SetItemString(self->ob_callbackdict, keybuf, callback) < 0)
  		return -1;
--- 2582,2586 ----
  			return -1;
  	/* And store the Python callback */
! 	sprintf(keybuf, "%x", (unsigned)which);
  	if (PyDict_SetItemString(self->ob_callbackdict, keybuf, callback) < 0)
  		return -1;
***************
*** 2588,2592 ****
  	PyObject *func, *rv;
  	
! 	sprintf(keybuf, "%x", which);
  	if ( self->ob_callbackdict == NULL ||
  			(func = PyDict_GetItemString(self->ob_callbackdict, keybuf)) == NULL ) {
--- 2594,2598 ----
  	PyObject *func, *rv;
  	
! 	sprintf(keybuf, "%x", (unsigned)which);
  	if ( self->ob_callbackdict == NULL ||
  			(func = PyDict_GetItemString(self->ob_callbackdict, keybuf)) == NULL ) {