Skip to content

C
core
Kaydet (Commit) 13bd3fc3 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane
Dosyalara gözat
Seçenekler

Don't override ODBC headers 

Change-Id: I47d0a1bb2a1fd275812fc2e647402f59bbf55442
üst a46bede8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
connectivity/source/inc/odbc/OFunctiondefs.hxx
Dosyayı görüntüle @ 13bd3fc3
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
#ifdef UNX #ifdef UNX
// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib)
#ifndef ODBC_UNX #ifndef ODBC_UNX
#define ODBC_UNX #define ODBC_UNX
#endif #endif
...@@ -66,14 +64,8 @@ ...@@ -66,14 +64,8 @@
#else #else
#include <odbc/sqlext.h> #include <odbc/sqlext.h>
#endif #endif
#undef sal_Bool // Is defined in qeodbc.h, but gets redefined by solar.h
#define SDB_ODBC_CHAR UCHAR #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 #endif // UNX
...@@ -92,11 +84,13 @@ ...@@ -92,11 +84,13 @@
#define SQL_C_WCHAR SQL_WCHAR #define SQL_C_WCHAR SQL_WCHAR
#endif #endif
#ifndef SQL_C_TCHAR
#ifdef UNICODE #ifdef UNICODE
#define SQL_C_TCHAR SQL_C_WCHAR #define SQL_C_TCHAR SQL_C_WCHAR
#else #else
#define SQL_C_TCHAR SQL_C_CHAR #define SQL_C_TCHAR SQL_C_CHAR
#endif #endif
#endif
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OFUNCTIONDEFS_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment