diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-26 18:25:56 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-26 18:25:56 +0200 |
| commit | 173e0172092fa87606a80a7b0d6b89323c7166b5 (patch) | |
| tree | c38d1dabaeaa9c5e1a4e0d0a02f45b65e8b04074 /dbaccess | |
| parent | e3ee8c68d580cd0782b9ae9497f3584a046f0404 (diff) | |
factorise odbc headers inclusion
it is complicated enough that we should implement that logic only once
Change-Id: I0cc5ffb871223b27df825f21612e3c8f6f2febb3
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index e75b160fe5e2..c301918eb9c7 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -20,12 +20,6 @@ #include <config_folders.h> #include "odbcconfig.hxx" -#ifdef SYSTEM_ODBC_HEADERS -#include <sqltypes.h> -#else -#include <odbc/sqltypes.h> -#endif - #include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -49,35 +43,7 @@ #endif #endif -// just to go with calling convention of windows -// so don't touch this -#if defined(WNT) -#undef SQL_API -#define SQL_API __stdcall -// At least under some circumstances, the below #include <odbc/sqlext.h> re- -// defines SQL_API to an empty string, leading to a compiler warning on MSC; to -// not break the current behavior, this is worked around by locally disabling -// that warning: -#if defined _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4005) -#endif -#endif // defined(WNT) - -#ifdef SYSTEM_ODBC_HEADERS -#include <sqlext.h> -#else -#include <odbc/sqlext.h> -#endif - -#if defined(WNT) -#if defined _MSC_VER -#pragma warning(pop) -#endif -#undef SQL_API -#define SQL_API __stdcall -#endif // defined(WNT) -// from here on you can do what you want to +#include <connectivity/odbc.hxx> #else |