Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22375/com/win32comext/axdebug/src
Modified Files:
Tag: py3k
AXDebug.cpp
Log Message:
Merge more PYWIN32_MODULE_* macro usage from the trunk
Index: AXDebug.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/src/AXDebug.cpp,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** AXDebug.cpp 14 Sep 2008 03:34:45 -0000 1.4.4.1
--- AXDebug.cpp 9 Dec 2008 12:38:52 -0000 1.4.4.2
***************
*** 283,315 ****
/* Module initialisation */
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void initaxdebug(void)
! #else
! PyObject *PyInit_axdebug(void)
! #endif
{
! PyObject *module, *dict;
!
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! module = Py_InitModule("axdebug", axdebug_methods);
! #else
! #define RETURN_ERROR return NULL;
! static PyModuleDef axdebug_def = {
! PyModuleDef_HEAD_INIT,
! "axdebug",
! "A module, encapsulating the ActiveX Debugging interfaces",
! -1,
! axdebug_methods
! };
! module = PyModule_Create(&axdebug_def);
! #endif
!
! if (!module)
! RETURN_ERROR;
! dict = PyModule_GetDict(module);
! if (!dict)
! RETURN_ERROR;
PyEval_InitThreads();
--- 283,290 ----
/* Module initialisation */
! PYWIN_MODULE_INIT_FUNC(axdebug)
{
! PYWIN_MODULE_INIT_PREPARE(axdebug, axdebug_methods,
! "A module, encapsulating the ActiveX Debugging interfaces");
PyEval_InitThreads();
***************
*** 404,409 ****
ADD_CONSTANT(TEXT_DOC_ATTR_READONLY); // @const axdebug|TEXT_DOC_ATTR_READONLY|Indicates that the document is read-only.
! #if (PY_VERSION_HEX >= 0x03000000)
! return module;
! #endif
}
--- 379,382 ----
ADD_CONSTANT(TEXT_DOC_ATTR_READONLY); // @const axdebug|TEXT_DOC_ATTR_READONLY|Indicates that the document is read-only.
! PYWIN_MODULE_INIT_RETURN_SUCCESS;
}
|
