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

[Jack Jansen]

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

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

Index: _Sndmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/snd/_Sndmodule.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** _Sndmodule.c	2001/09/04 22:17:10	1.2
--- _Sndmodule.c	2001/09/05 10:28:49	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 */
***************
*** 23,28 ****
  #include <Carbon/Carbon.h>
  #endif
- 
  
  /* Create a SndCommand object (an (int, int, int) tuple) */
  static PyObject *
--- 27,32 ----
  #include <Carbon/Carbon.h>
  #endif
  
+ #if !TARGET_API_MAC_CARBON
  /* Create a SndCommand object (an (int, int, int) tuple) */
  static PyObject *
***************
*** 31,34 ****
--- 35,39 ----
  	return Py_BuildValue("hhl", pc->cmd, pc->param1, pc->param2);
  }
+ #endif
  
  /* Convert a SndCommand argument */
***************
*** 81,94 ****
  	return (PyObject *)it;
  }
- static int SndCh_Convert(PyObject *v, SndChannelPtr *p_itself)
- {
- 	if (!SndCh_Check(v))
- 	{
- 		PyErr_SetString(PyExc_TypeError, "SndChannel required");
- 		return 0;
- 	}
- 	*p_itself = ((SndChannelObject *)v)->ob_itself;
- 	return 1;
- }
  
  static void SndCh_dealloc(SndChannelObject *self)
--- 86,89 ----
***************
*** 234,238 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&theStatus__out__, (int)sizeof(SCStatus));
-  theStatus__error__: ;
  	return _res;
  }
--- 229,232 ----
***************
*** 373,377 ****
  	return (PyObject *)it;
  }
! static SPBObj_Convert(PyObject *v, SPBPtr *p_itself)
  {
  	if (!SPBObj_Check(v))
--- 367,371 ----
  	return (PyObject *)it;
  }
! static int SPBObj_Convert(PyObject *v, SPBPtr *p_itself)
  {
  	if (!SPBObj_Check(v))
***************
*** 475,479 ****
  {
  	PyObject *_res = NULL;
! 	return SPBObj_New();
  }
  
--- 469,473 ----
  {
  	PyObject *_res = NULL;
! 	_res = SPBObj_New(); return _res;
  }
  
***************
*** 573,577 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&theStatus__out__, (int)sizeof(SMStatus));
-  theStatus__error__: ;
  	return _res;
  }
--- 567,570 ----
***************
*** 897,901 ****
  	_res = Py_BuildValue("s#",
  	                     (char *)&cp__out__, (int)sizeof(CompressionInfo));
-  cp__error__: ;
  	return _res;
  }
--- 890,893 ----