X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b7f1aab47f7560046f8e5f7f9dc34b468f9200f..ac0c4cc396523e217cde2c605e670674b4990de2:/include/wx/odbc.h?ds=inline

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 08587be677..b40e47e5f3 100644
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Olaf Klein, Patrick Halke, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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>