applied patch 419155 (OLE x-compilation with mingw)

[wxWidgets.git] / src / common / db.cpp

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 6b5bff21b229ab6ccb4b2524ed563ba60563a355..218d94e777208d6711e9cbd55c1ec598056b6a24 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -751,10 +751,10 @@ bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthSt
         if (!getDataTypeInfo(SQL_VARBINARY,typeInfBlob))
             return(FALSE);
         else
-            typeInfInteger.FsqlType = SQL_VARBINARY;
+            typeInfBlob.FsqlType = SQL_VARBINARY;
     }
     else
-        typeInfInteger.FsqlType = SQL_LONGVARBINARY;
+        typeInfBlob.FsqlType = SQL_LONGVARBINARY;
 
 //typeInfBlob.TypeName = "BLOB";
 
@@ -2105,7 +2105,7 @@ wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
  */
 {
     UWORD          noCols = 0;
-    int                         colNo  = 0;
+    UWORD               colNo  = 0;
     wxDbColInf *colInf = 0;
 
     RETCODE  retcode;
@@ -2263,7 +2263,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wx
 
 {
     UWORD       noCols = 0;
-    int         colNo  = 0;
+    UWORD       colNo  = 0;
     wxDbColInf *colInf = 0;
 
     RETCODE  retcode;
@@ -2518,7 +2518,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
 //       to avoid undesired unbinding of columns.
 {
     UWORD       noCols = 0;
-    int         colNo  = 0;
+    UWORD       colNo  = 0;
     wxDbColInf *colInf = 0;
 
     RETCODE  retcode;