diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-19 05:53:43 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-19 05:59:12 +0200 |
| commit | 13bd3fc3b87aac08d8e418186766d88ba849e26d (patch) | |
| tree | b4bef35015057caf4c2fc0b080599770f399257b /connectivity | |
| parent | a46bede8eebcf08c180572268e9fb5e52d0935bd (diff) | |
Don't override ODBC headers
Change-Id: I47d0a1bb2a1fd275812fc2e647402f59bbf55442
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index e77b08e6b02c..db4f69535912 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -54,8 +54,6 @@ #ifdef UNX -// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib) - #ifndef ODBC_UNX #define ODBC_UNX #endif @@ -66,14 +64,8 @@ #else #include <odbc/sqlext.h> #endif -#undef sal_Bool // Is defined in qeodbc.h, but gets redefined by solar.h #define SDB_ODBC_CHAR UCHAR -#define SQL_WCHAR (-8) -#define SQL_WVARCHAR (-9) -#define SQL_WLONGVARCHAR (-10) -#define SQL_C_WCHAR SQL_WCHAR - #endif // UNX @@ -92,11 +84,13 @@ #define SQL_C_WCHAR SQL_WCHAR #endif +#ifndef SQL_C_TCHAR #ifdef UNICODE #define SQL_C_TCHAR SQL_C_WCHAR #else #define SQL_C_TCHAR SQL_C_CHAR #endif +#endif #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX |