Fix linking problems with MSVC 5.

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

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 08587be677a3006e11575f55d88a2ca84f33dc4a..c75a316369a3355ffb21fe6abd7c2a4c8b9d823e 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -13,30 +13,29 @@
 
 #if wxUSE_ODBC
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "odbc.h"
 #endif
 
 #ifndef _WX_ODBCH__
 #define _WX_ODBCH__
 
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
+//#ifdef __WXMSW__
+//#include <windows.h>
+//#endif
 
 
 #ifdef __UNIX__
 extern "C"
 {
-    #include "../../src/iodbc/isql.h"
-    #include "../../src/iodbc/isqlext.h"
-    #include "../../src/iodbc/odbc_funcs.h"
-    #include "../../src/iodbc/odbc_types.h"
+    #include "wx/isql.h"
+    #include "wx/isqlext.h"
 
     typedef float   SFLOAT;
     typedef double  SDOUBLE;
 
     #define ULONG UDWORD
+    #define SQL_SQLSTATE_SIZE 5
 }
 #else // !Unix
     #include <sqlext.h>