X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b7f1aab47f7560046f8e5f7f9dc34b468f9200f..923b48fc637dd3aa9ed1d396ceb872cd3bcaabd1:/include/wx/odbc.h diff --git a/include/wx/odbc.h b/include/wx/odbc.h index 08587be677..c75a316369 100644 --- 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>