Warning fixes for Cygwin

[wxWidgets.git] / include / wx / db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 8c05a2aae39faada84dfbd00adab7d39f6b304f2..2b66a88b4adcde49000e979a3606cd0fe52c4f67 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -26,19 +26,15 @@
 #define _WX_DB_H_
 
 
-// BJO 20000503: introduce new GetColumns members which are more database independant and
+// BJO 20000503: introduce new GetColumns members which are more database independent and
 //               return columns in the order they were created
 #define OLD_GETCOLUMNS 1
 #define EXPERIMENTAL_WXDB_FUNCTIONS 1
 
-#include "wx/version.h"
-
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "db.h"
 #endif
 
-#include "wx/setup.h"
-
 #include "wx/defs.h"
 #include "wx/string.h"
 
@@ -81,7 +77,11 @@
         #include "wx/isqlext.h"
         // Not available in v2.x of iODBC
         #ifndef __WXMSW__
-            typedef wxChar SQLTCHAR;
+          #if wxUSE_UNICODE
+          typedef wxChar SQLTCHAR;
+          #else
+          typedef UCHAR SQLTCHAR;
+          #endif
         #endif
     #else
         #include <sql.h>
@@ -613,7 +613,7 @@ public:
     wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 #endif
     wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH];
-    SDWORD nativeError;
+    SQLINTEGER nativeError;
     wxChar sqlState[20];
 
 #if wxODBC_BACKWARD_COMPATABILITY