[pywin32-checkins] pywin32/win32/src odbc.cpp, 1.20, 1.21 dbi.cpp, 1.10, NONE dbi.def, 1.1, NONE dbi.h, 1.4, NONE

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32483

Modified Files:
	odbc.cpp 
Removed Files:
	dbi.cpp dbi.def dbi.h 
Log Message:
Pick up compatible changes from py3k branch
Remove dbi module

--- dbi.h DELETED ---

--- dbi.cpp DELETED ---

--- dbi.def DELETED ---

Index: odbc.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/odbc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** odbc.cpp	29 Jun 2007 16:21:32 -0000	1.20
--- odbc.cpp	6 Oct 2008 00:40:28 -0000	1.21
***************
*** 16,19 ****
--- 16,22 ----
  
  #include "PyWinTypes.h"
+ #include "PyWinObjects.h"
+ #include "structmember.h"
+ 
  #include <sql.h>
  #include <sqlext.h>
***************
*** 29,50 ****
[...1984 lines suppressed...]
  };
  
  static int odbcCompare(const void * v1, const void * v2)
  {
! 	return _tcscmp(((const odbcErrorDesc *) v1)->state,
  				  ((const odbcErrorDesc *) v2)->state);
  }
***************
*** 1990,1994 ****
  
  
! static odbcErrorDesc *lookupError(const char *sqlState)
  {
  	odbcErrorDesc key;
--- 2182,2186 ----
  
  
! static odbcErrorDesc *lookupError(const TCHAR *sqlState)
  {
  	odbcErrorDesc key;