[pywin32-checkins] pywin32/com/win32comext/axcontrol/src AXControl.cpp, 1.8.2.2, 1.8.2.3

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

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

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

Index: AXControl.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axcontrol/src/AXControl.cpp,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** AXControl.cpp	2 Nov 2008 11:52:02 -0000	1.8.2.2
--- AXControl.cpp	9 Dec 2008 12:38:52 -0000	1.8.2.3
***************
*** 402,406 ****
  
  
! #define ADD_CONSTANT(tok) if (PyModule_AddIntConstant(module, #tok, tok) == -1) RETURN_ERROR;
  
  static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
--- 402,406 ----
  
  
! #define ADD_CONSTANT(tok) if (PyModule_AddIntConstant(module, #tok, tok) == -1) PYWIN_MODULE_INIT_RETURN_ERROR;
  
  static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
***************
*** 426,458 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initaxcontrol(void)
! #else
! PyObject *PyInit_axcontrol(void)
! #endif
  {
! 	PyObject *dict, *module;
! 
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! 	module = Py_InitModule("axcontrol", axcontrol_methods);
! #else
! #define RETURN_ERROR return NULL;
! 	static PyModuleDef axcontrol_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"axcontrol",
! 		"A module, encapsulating the ActiveX Control interfaces.",
! 		-1,
! 		axcontrol_methods
! 		};
! 	module = PyModule_Create(&axcontrol_def);
! #endif
! 
! 	if (!module)
! 		RETURN_ERROR;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)
! 		RETURN_ERROR;
  
  	// Register all of our interfaces, gateways and IIDs.
--- 426,433 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(axcontrol)
  {
! 	PYWIN_MODULE_INIT_PREPARE(axcontrol, axcontrol_methods,
! 	                          "A module, encapsulating the ActiveX Control interfaces.");
  
  	// Register all of our interfaces, gateways and IIDs.
***************
*** 485,490 ****
  	ADD_CONSTANT(OLECREATE_LEAVERUNNING); // @const axcontrol|OLECREATE_LEAVERUNNING|
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 460,463 ----
  	ADD_CONSTANT(OLECREATE_LEAVERUNNING); // @const axcontrol|OLECREATE_LEAVERUNNING|
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }