[pywin32-checkins] pywin32/win32/src dbi.cpp,1.5,1.6

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26717

Modified Files:
	dbi.cpp 
Log Message:
[ 956247 ] convert C++ comments to C in dbi.cpp


Index: dbi.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/dbi.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dbi.cpp	18 Apr 2002 02:12:36 -0000	1.5
--- dbi.cpp	13 Jul 2004 05:05:27 -0000	1.6
***************
*** 15,21 ****
  #include "intobject.h"
  
! // 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
--- 15,21 ----
  #include "intobject.h"
  
! /* 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
***************
*** 55,59 ****
  {
  	Py_DECREF(((DbiContainer *) self)->objectOf);
! #ifdef PyObject_Del // see top of file for 1.5.2 comments
  	PyObject_Del(self);
  #else
--- 55,59 ----
  {
  	Py_DECREF(((DbiContainer *) self)->objectOf);
! #ifdef PyObject_Del /* see top of file for 1.5.2 comments */
  	PyObject_Del(self);
  #else
***************
*** 64,68 ****
  static PyMethodDef noMethods[] =
  {
! 	0, 0
  };
  
--- 64,68 ----
  static PyMethodDef noMethods[] =
  {
! 	{0, 0}
  };
  
***************
*** 85,89 ****
  {
  	long l = PyInt_AsLong(dbiValue(o));
! 	return PyString_FromStringAndSize(ctime(&l), 24); // less \n
  }
  
--- 85,89 ----
  {
  	long l = PyInt_AsLong(dbiValue(o));
! 	return PyString_FromStringAndSize(ctime(&l), 24); /* less \n */
  }
  
***************
*** 266,275 ****
  };
  
! void initdbi()
  {
  	PyObject *m = Py_InitModule("dbi", globalMethods);
  	if (!m) /* Eeek - some serious error! */
  		return;
! 	PyObject *d = PyModule_GetDict(m);
  	if (!d) return; /* Another serious error!*/
  	PyDict_SetItemString(d, "STRING",
--- 266,277 ----
  };
  
! PyMODINIT_FUNC
! initdbi()
  {
  	PyObject *m = Py_InitModule("dbi", globalMethods);
+ 	PyObject *d;
  	if (!m) /* Eeek - some serious error! */
  		return;
! 	d = PyModule_GetDict(m);
  	if (!d) return; /* Another serious error!*/
  	PyDict_SetItemString(d, "STRING",