Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11082
Modified Files:
Tag: py3k
odbc.cpp
Log Message:
Some fixes for 64-bit
Index: odbc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/odbc.cpp,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C2 -d -r1.20.2.2 -r1.20.2.3
*** odbc.cpp 6 Sep 2008 22:33:20 -0000 1.20.2.2
--- odbc.cpp 14 Sep 2008 15:53:44 -0000 1.20.2.3
***************
*** 31,47 ****
#endif
! #ifdef _WIN64
! # define mktime _mktime32
! #endif
!
! /* Python 1.5.2 doesn't have PyObject_New
! PyObject_NEW is not *quite* as safe, but seem to work fine
! (as all win32all for 1.5.2 used it! */
! #ifndef PyObject_New
! #define PyObject_New PyObject_NEW
! #endif
! #ifndef PyObject_Del
! #define PyObject_Del PyMem_DEL
! #endif
#include "dbi.h" /*$ This is a hack */
--- 31,37 ----
#endif
! // #ifdef _WIN64
! // # define mktime _mktime32
! // #endif
#include "dbi.h" /*$ This is a hack */
***************
*** 629,633 ****
gt.tm_min = dt->minute;
gt.tm_sec = dt->second;
! return dbiMakeDate(PyInt_FromLong(mktime(>)));
}
--- 619,623 ----
gt.tm_min = dt->minute;
gt.tm_sec = dt->second;
! return dbiMakeDate(PyLong_FromLongLong(mktime(>)));
}
|
