[pywin32-checkins] pywin32/com/win32comext/propsys/src propsys.cpp, 1.1.2.1, 1.1.2.2

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

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

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

Index: propsys.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/propsys/src/propsys.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** propsys.cpp	17 Sep 2008 08:40:55 -0000	1.1.2.1
--- propsys.cpp	9 Dec 2008 12:38:52 -0000	1.1.2.2
***************
*** 74,116 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initpropsys(void)
! #else
! PyObject *PyInit_propsys(void)
! #endif
  {
! 	PyObject *dict, *module;
! 
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! 	module = Py_InitModule("propsys", propsys_methods);
! 
! #else
! #define RETURN_ERROR return NULL;
! 	static PyModuleDef propsys_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"propsys",
! 		"A module, encapsulating the Vista Property System interfaces",
! 		-1,
! 		propsys_methods
! 		};
! 	module = PyModule_Create(&propsys_def);
! #endif
! 
! 	if (!module)
! 		RETURN_ERROR;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		RETURN_ERROR;
  
  	if (PyDict_SetItemString(dict, "error", PyWinExc_COMError) == -1)
! 		RETURN_ERROR;
  
  	// Register all of our interfaces, gateways and IIDs.
  	//PyCom_RegisterExtensionSupport(dict, g_interfaceSupportData, sizeof(g_interfaceSupportData)/sizeof(PyCom_InterfaceSupportInfo));
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 74,88 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(propsys)
  {
! 	PYWIN_MODULE_INIT_PREPARE(propsys, propsys_methods,
! 	                          "A module, encapsulating the Vista Property System interfaces");
  
  	if (PyDict_SetItemString(dict, "error", PyWinExc_COMError) == -1)
! 		PYWIN_MODULE_INIT_RETURN_ERROR;
  
  	// Register all of our interfaces, gateways and IIDs.
  	//PyCom_RegisterExtensionSupport(dict, g_interfaceSupportData, sizeof(g_interfaceSupportData)/sizeof(PyCom_InterfaceSupportInfo));
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }