[pywin32-checkins] pywin32/com/win32comext/axscript/src AXScript.cpp, 1.3.4.1, 1.3.4.2

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

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

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

Index: AXScript.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/AXScript.cpp,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** AXScript.cpp	14 Sep 2008 06:02:56 -0000	1.3.4.1
--- AXScript.cpp	9 Dec 2008 12:38:52 -0000	1.3.4.2
***************
*** 141,175 ****
  
  /* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initaxscript(void)
! #else
! PyObject *PyInit_axscript(void)
! #endif
  {
! 	PyObject *dict, *module;
! 	char *modName = "axscript";
! 	// Create the module and add the functions
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! 	module = Py_InitModule(modName, axcom_methods);
! 
! #else
! #define RETURN_ERROR return NULL;
! 	static PyModuleDef axscript_def = {
! 		PyModuleDef_HEAD_INIT,
! 		"axscript",
! 		"A module, encapsulating the ActiveX Scripting interfaces.",
! 		-1,
! 		axcom_methods
! 		};
! 	module = PyModule_Create(&axscript_def);
! #endif
! 
! 	if (!module) /* Eeek - some serious error! */
! 		RETURN_ERROR;
! 	dict = PyModule_GetDict(module);
! 	if (!dict)	/* Another serious error!*/
! 		RETURN_ERROR;
  
  	// Register all of our interfaces, gateways and IIDs.
--- 141,148 ----
  
  /* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(axscript)
  {
! 	PYWIN_MODULE_INIT_PREPARE(axscript, axcom_methods,
! 	                          "A module, encapsulating the ActiveX Scripting interfaces.");
  
  	// Register all of our interfaces, gateways and IIDs.
***************
*** 233,238 ****
  #endif
  
! #if (PY_VERSION_HEX >= 0x03000000)
! 	return module;
! #endif
  }
--- 206,209 ----
  #endif
  
! 	PYWIN_MODULE_INIT_RETURN_SUCCESS;
  }