[pywin32-checkins] pywin32/com/win32comext/directsound/src directsound.cpp, 1.8.4.3, 1.8.4.4

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/directsound/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22375/com/win32comext/directsound/src

Modified Files:
      Tag: py3k
	directsound.cpp 
Log Message:
Merge more PYWIN32_MODULE_* macro usage from the trunk

Index: directsound.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/directsound/src/directsound.cpp,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -C2 -d -r1.8.4.3 -r1.8.4.4
*** directsound.cpp	13 Sep 2008 16:09:51 -0000	1.8.4.3
--- directsound.cpp	9 Dec 2008 12:38:52 -0000	1.8.4.4
***************
*** 238,242 ****
  
  
! #define ADD_CONSTANT(tok) if (PyModule_AddIntConstant(module, #tok, tok) == -1) RETURN_ERROR;
  
  static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
--- 238,242 ----
  
  
! #define ADD_CONSTANT(tok) if (PyModule_AddIntConstant(module, #tok, tok) == -1) PYWIN_MODULE_INIT_RETURN_ERROR;
  
  static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
***************
*** 250,283 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initdirectsound(void)
! #else
! PyObject *PyInit_directsound(void)
! #endif
  {
! 	PyObject *dict, *module;
! 	PyWinGlobals_Ensure();
! 
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! 	module = Py_InitModule("directsound", directsound_methods);
! #else
! #define RETURN_ERROR return NULL;
! 	static PyModuleDef directsound_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"directsound",
! 		"A module encapsulating the DirectSound interfaces.",
! 		-1,
! 		directsound_methods
! 		};
! 	module = PyModule_Create(&directsound_def);
! #endif
! 
! 	if (!module)
! 		RETURN_ERROR;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		RETURN_ERROR;
  
  
--- 250,257 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(directsound)
  {
! 	PYWIN_MODULE_INIT_PREPARE(directsound, directsound_methods,
! 	                          "A module encapsulating the DirectSound interfaces.");
  
  
***************
*** 417,425 ****
  		||PyDict_SetItemString(dict, "DSCBCAPSType", (PyObject *)&PyDSCBCAPSType) == -1
  		||PyDict_SetItemString(dict, "DSCBUFFERDESCType", (PyObject *)&PyDSCBUFFERDESCType) == -1)
! 		RETURN_ERROR;
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
  
--- 391,397 ----
  		||PyDict_SetItemString(dict, "DSCBCAPSType", (PyObject *)&PyDSCBCAPSType) == -1
  		||PyDict_SetItemString(dict, "DSCBUFFERDESCType", (PyObject *)&PyDSCBUFFERDESCType) == -1)
! 		PYWIN_MODULE_INIT_RETURN_ERROR;
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }