Update of /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22375/com/win32comext/taskscheduler/src
Modified Files:
Tag: py3k
taskscheduler.cpp
Log Message:
Merge more PYWIN32_MODULE_* macro usage from the trunk
Index: taskscheduler.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/taskscheduler.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -C2 -d -r1.2.4.2 -r1.2.4.3
*** taskscheduler.cpp 7 Sep 2008 04:12:25 -0000 1.2.4.2
--- taskscheduler.cpp 9 Dec 2008 12:38:52 -0000 1.2.4.3
***************
*** 25,65 ****
};
!
! extern "C" __declspec(dllexport)
! #if (PY_VERSION_HEX < 0x03000000)
! void inittaskscheduler(void)
! #else
! PyObject *PyInit_taskscheduler(void)
! #endif
{
! PyObject *dict, *module;
! PyWinGlobals_Ensure();
!
! #if (PY_VERSION_HEX < 0x03000000)
! #define RETURN_ERROR return;
! module = Py_InitModule("taskscheduler", taskscheduler_methods);
! #else
! #define RETURN_ERROR return NULL;
! static PyModuleDef taskscheduler_def = {
! PyModuleDef_HEAD_INIT,
! "taskscheduler",
! "Supports the Scheduled Tasks COM interfaces",
! -1,
! taskscheduler_methods
! };
! module = PyModule_Create(&taskscheduler_def);
! #endif
- if (!module)
- RETURN_ERROR;
- dict = PyModule_GetDict(module);
- if (!dict)
- RETURN_ERROR;
if (PyType_Ready(&PyTASK_TRIGGERType) == -1)
! RETURN_ERROR;
// Register all of our interfaces, gateways and IIDs.
PyCom_RegisterExtensionSupport(dict, register_data, sizeof(register_data)/sizeof(PyCom_InterfaceSupportInfo));
!
// trigger types
PyModule_AddIntConstant(module,"TASK_TIME_TRIGGER_ONCE", TASK_TIME_TRIGGER_ONCE);
--- 25,39 ----
};
! PYWIN_MODULE_INIT_FUNC(taskscheduler)
{
! PYWIN_MODULE_INIT_PREPARE(taskscheduler, taskscheduler_methods,
! "Supports the Scheduled Tasks COM interfaces");
if (PyType_Ready(&PyTASK_TRIGGERType) == -1)
! PYWIN_MODULE_INIT_RETURN_ERROR;
// Register all of our interfaces, gateways and IIDs.
PyCom_RegisterExtensionSupport(dict, register_data, sizeof(register_data)/sizeof(PyCom_InterfaceSupportInfo));
!
// trigger types
PyModule_AddIntConstant(module,"TASK_TIME_TRIGGER_ONCE", TASK_TIME_TRIGGER_ONCE);
***************
*** 157,162 ****
PyModule_AddIntConstant(module,"TASKPAGE_SETTINGS", TASKPAGE_SETTINGS);
! #if (PY_VERSION_HEX >= 0x03000000)
! return module;
! #endif
}
--- 131,134 ----
PyModule_AddIntConstant(module,"TASKPAGE_SETTINGS", TASKPAGE_SETTINGS);
! PYWIN_MODULE_INIT_RETURN_SUCCESS;
}
|