python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-16 12:27:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows (blech) compatibility changes. (Gerhard H�ring)

Browse Source
This commit is contained in:
adustman
2002-08-02 04:09:13 +00:00
parent 97683ade62
commit 226d7fc212
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MySQLdb/_mysql.c
View File

@ -1926,11 +1926,7 @@ _mysql_ResultObject_setattr(
} }
PyTypeObject _mysql_ConnectionObject_Type = { PyTypeObject _mysql_ConnectionObject_Type = {
#ifndef MS_WIN32
PyObject_HEAD_INIT(&PyType_Type)
#else
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
#endif
0, 0,
"_mysql.connection", /* (char *)tp_name For printing */ "_mysql.connection", /* (char *)tp_name For printing */
sizeof(_mysql_ConnectionObject), sizeof(_mysql_ConnectionObject),
@ -2002,9 +1998,9 @@ PyTypeObject _mysql_ConnectionObject_Type = {
0, /* (descrsetfunc) tp_descr_set */ 0, /* (descrsetfunc) tp_descr_set */
0, /* (long) tp_dictoffset */ 0, /* (long) tp_dictoffset */
(initproc)_mysql_ConnectionObject_Initialize, /* tp_init */ (initproc)_mysql_ConnectionObject_Initialize, /* tp_init */
(allocfunc)PyType_GenericAlloc, /* tp_alloc */ NULL, /* tp_alloc */
(newfunc)PyType_GenericNew, /* tp_new */ NULL, /* tp_new */
(destructor)_PyObject_GC_Del, /* tp_free Low-level free-memory routine */ NULL, /* tp_free Low-level free-memory routine */
0, /* (PyObject *) tp_bases */ 0, /* (PyObject *) tp_bases */
0, /* (PyObject *) tp_mro method resolution order */ 0, /* (PyObject *) tp_mro method resolution order */
0, /* (PyObject *) tp_defined */ 0, /* (PyObject *) tp_defined */
@ -2014,11 +2010,7 @@ PyTypeObject _mysql_ConnectionObject_Type = {
} ; } ;
PyTypeObject _mysql_ResultObject_Type = { PyTypeObject _mysql_ResultObject_Type = {
#ifndef MS_WIN32
PyObject_HEAD_INIT(&PyType_Type)
#else
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT(NULL)
#endif
0, 0,
"_mysql.result", "_mysql.result",
sizeof(_mysql_ResultObject), sizeof(_mysql_ResultObject),
@ -2091,9 +2083,9 @@ PyTypeObject _mysql_ResultObject_Type = {
0, /* (descrsetfunc) tp_descr_set */ 0, /* (descrsetfunc) tp_descr_set */
0, /* (long) tp_dictoffset */ 0, /* (long) tp_dictoffset */
(initproc)_mysql_ResultObject_Initialize, /* tp_init */ (initproc)_mysql_ResultObject_Initialize, /* tp_init */
(allocfunc)PyType_GenericAlloc, /* tp_alloc */ NULL, /* tp_alloc */
(newfunc)PyType_GenericNew, /* tp_new */ NULL, /* tp_new */
(destructor)_PyObject_GC_Del, /* tp_free Low-level free-memory routine */ NULL, /* tp_free Low-level free-memory routine */
0, /* (PyObject *) tp_bases */ 0, /* (PyObject *) tp_bases */
0, /* (PyObject *) tp_mro method resolution order */ 0, /* (PyObject *) tp_mro method resolution order */
0, /* (PyObject *) tp_defined */ 0, /* (PyObject *) tp_defined */
@ -2197,10 +2189,18 @@ init_mysql(void)
PyObject *dict, *module, *emod, *edict; PyObject *dict, *module, *emod, *edict;
module = Py_InitModule4("_mysql", _mysql_methods, _mysql___doc__, module = Py_InitModule4("_mysql", _mysql_methods, _mysql___doc__,
(PyObject *)NULL, PYTHON_API_VERSION); (PyObject *)NULL, PYTHON_API_VERSION);
#ifdef MS_WIN32
_mysql_ConnectionObject_Type.ob_type = &PyType_Type; _mysql_ConnectionObject_Type.ob_type = &PyType_Type;
_mysql_ResultObject_Type.ob_type = &PyType_Type; _mysql_ResultObject_Type.ob_type = &PyType_Type;
#if PY_VERSION_HEX >= 0x02020000
_mysql_ConnectionObject_Type.tp_alloc = (allocfunc)PyType_GenericAlloc;
_mysql_ConnectionObject_Type.tp_new = (newfunc)PyType_GenericNew;
_mysql_ConnectionObject_Type.tp_free = (destructor)_PyObject_GC_Del;
_mysql_ResultObject_Type.tp_alloc = (allocfunc)PyType_GenericAlloc;
_mysql_ResultObject_Type.tp_new = (newfunc)PyType_GenericNew;
_mysql_ResultObject_Type.tp_free = (destructor)_PyObject_GC_Del;
#endif #endif
if (!(dict = PyModule_GetDict(module))) goto error; if (!(dict = PyModule_GetDict(module))) goto error;
if (PyDict_SetItemString(dict, "version_info", if (PyDict_SetItemString(dict, "version_info",
PyRun_String(version_info, Py_eval_input, PyRun_String(version_info, Py_eval_input,