Update of /cvsroot/pywin32/pywin32/com/win32comext/axcontrol/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9817/com/win32comext/axcontrol/src
Modified Files:
AXControl.cpp
Log Message:
Yet more TCHAR/64bit and other misc changes from py3k branch.
Index: AXControl.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axcontrol/src/AXControl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AXControl.cpp 2 Nov 2008 11:47:47 -0000 1.9
--- AXControl.cpp 13 Nov 2008 11:11:58 -0000 1.10
***************
*** 401,417 ****
};
- static int AddConstant(PyObject *dict, const char *key, long value)
- {
- PyObject *oval = PyInt_FromLong(value);
- if (!oval)
- {
- return 1;
- }
- int rc = PyDict_SetItemString(dict, (char*)key, oval);
- Py_DECREF(oval);
- return rc;
- }
! #define ADD_CONSTANT(tok) AddConstant(dict, #tok, tok)
static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
--- 401,406 ----
};
! #define ADD_CONSTANT(tok) if (PyModule_AddIntConstant(module, #tok, tok) == -1) RETURN_ERROR;
static const PyCom_InterfaceSupportInfo g_interfaceSupportData[] =
***************
*** 440,449 ****
{
char *modName = "axcontrol";
! PyObject *oModule;
// Create the module and add the functions
! oModule = Py_InitModule(modName, axcontrol_methods);
! if (!oModule) /* Eeek - some serious error! */
return;
! PyObject *dict = PyModule_GetDict(oModule);
if (!dict) return; /* Another serious error!*/
--- 429,439 ----
{
char *modName = "axcontrol";
! PyObject *module;
// Create the module and add the functions
! module = Py_InitModule(modName, axcontrol_methods);
! #define RETURN_ERROR return // towards py3k
! if (!module) /* Eeek - some serious error! */
return;
! PyObject *dict = PyModule_GetDict(module);
if (!dict) return; /* Another serious error!*/
|
