[pywin32-checkins] pywin32/win32/src dbi.h,1.3,1.4

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

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

Modified Files:
	dbi.h 
Log Message:
Recent platform changes failed to build on Windows - try this :)


Index: dbi.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/dbi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbi.h	13 Jul 2004 05:03:30 -0000	1.3
--- dbi.h	13 Jul 2004 05:15:00 -0000	1.4
***************
*** 12,37 ****
  #define DBI_H
  
! PyAPI_FUNC(int) dbiIsDate(const PyObject *o);
! PyAPI_FUNC(int) dbiIsRaw(const PyObject *o);
! PyAPI_FUNC(int) dbiIsRowId(const PyObject *o);
  
  /* These do not INCREF */
! PyAPI_FUNC(PyObject) *dbiValue(PyObject *o);  
! PyAPI_FUNC(PyObject) *dbiMakeDate(PyObject *contents);
! PyAPI_FUNC(PyObject) *dbiMakeRaw(PyObject *contents);
! PyAPI_FUNC(PyObject) *dbiMakeRowId(PyObject *contents);
  
! PyAPI_FUNC(PyObject)*DbiString;
! PyAPI_FUNC(PyObject)*DbiRaw;
! PyAPI_FUNC(PyObject)*DbiRowId;
! PyAPI_FUNC(PyObject)*DbiNumber;
! PyAPI_FUNC(PyObject)*DbiDate;
  
! PyAPI_FUNC(PyObject)*DbiNoError;
! PyAPI_FUNC(PyObject)*DbiOpError;
! PyAPI_FUNC(PyObject)*DbiProgError;
! PyAPI_FUNC(PyObject)*DbiIntegrityError;
! PyAPI_FUNC(PyObject)*DbiDataError;
! PyAPI_FUNC(PyObject)*DbiInternalError;
  
  
--- 12,47 ----
  #define DBI_H
  
! #ifdef MS_WIN32
! #ifdef DBI_EXPORT
! #define DBI_FUNC(x) __declspec(dllexport) x
! #else
! #define DBI_FUNC(x) __declspec(dllimport) x
! #endif /* DBI_EXPORT */
! #else /* MS_WIN32 */
! #define DBI_FUNC(x) x
! #endif
! 
! DBI_FUNC(int) dbiIsDate(const PyObject *o);
! DBI_FUNC(int) dbiIsRaw(const PyObject *o);
! DBI_FUNC(int) dbiIsRowId(const PyObject *o);
  
  /* These do not INCREF */
! DBI_FUNC(PyObject) *dbiValue(PyObject *o);  
! DBI_FUNC(PyObject) *dbiMakeDate(PyObject *contents);
! DBI_FUNC(PyObject) *dbiMakeRaw(PyObject *contents);
! DBI_FUNC(PyObject) *dbiMakeRowId(PyObject *contents);
  
! DBI_FUNC(PyObject)*DbiString;
! DBI_FUNC(PyObject)*DbiRaw;
! DBI_FUNC(PyObject)*DbiRowId;
! DBI_FUNC(PyObject)*DbiNumber;
! DBI_FUNC(PyObject)*DbiDate;
  
! DBI_FUNC(PyObject)*DbiNoError;
! DBI_FUNC(PyObject)*DbiOpError;
! DBI_FUNC(PyObject)*DbiProgError;
! DBI_FUNC(PyObject)*DbiIntegrityError;
! DBI_FUNC(PyObject)*DbiDataError;
! DBI_FUNC(PyObject)*DbiInternalError;