X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1218415705b9fcb40dedbc38c55632c0c3cb6df..dd3c394ae4e6f6a0041b69e036d4fdf0a085fe39:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 2f4260bcf8..8d29a834e5 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -45,11 +45,9 @@
 extern "C" {
 #include <../iodbc/isql.h>
 #include <../iodbc/isqlext.h>
-#include <../iodbc/odbc_funcs.h>
-#include <../iodbc/odbc_types.h>
-
-typedef float   SFLOAT;
-typedef double  SDOUBLE;
+typedef float         SFLOAT;
+typedef double        SDOUBLE;
+typedef unsigned int  UINT;
 #define ULONG UDWORD
 
 }
@@ -263,12 +261,12 @@ public:
 	struct
 	{
 		char   dbmsName[40];								// Name of the dbms product
-		char   dbmsVer[20];								// Version # of the dbms product
+		char   dbmsVer[40];								// Version # of the dbms product
 		char   driverName[40];							// Driver name
-		char   odbcVer[20];								// ODBC version of the driver
-		char   drvMgrOdbcVer[20];						// ODBC version of the driver manager
-		char   driverVer[40];							// Driver version
-		char   serverName[40];							// Server Name, typically a connect string
+		char   odbcVer[60];								// ODBC version of the driver
+		char   drvMgrOdbcVer[60];						// ODBC version of the driver manager
+		char   driverVer[60];							// Driver version
+		char   serverName[80];							// Server Name, typically a connect string
 		char	 databaseName[128];						// Database filename
 		char   outerJoins[2];							// Indicates whether the data source supports outer joins
 		char	 procedureSupport[2];					// Indicates whether the data source supports stored procedures