connectivity/Library_odbc.mk | 2 ++
connectivity/source/inc/odbc/OFunctiondefs.hxx | 10 ++--------
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 13bd3fc3b87aac08d8e418186766d88ba849e26d
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Sep 19 05:53:43 2014 +0200
Don't override ODBC headers
Change-Id: I47d0a1bb2a1fd275812fc2e647402f59bbf55442
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx
b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index e77b08e..db4f695 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
commit a46bede8eebcf08c180572268e9fb5e52d0935bd
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Sep 19 05:53:06 2014 +0200
fdo#83924 align with system ODBC ABI on MacOSX: SQL_WCHAR is wchar_t
Change-Id: I0e3478279d750ff0b044fa79b88e99bcae82beb9
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 369ba2b..9b8bce1 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,odbc,\
$(eval $(call gb_Library_add_defs,odbc,\
-DOOO_DLLIMPLEMENTATION_ODBCBASE \
+ $(if $(and $(filter MACOSX,$(OS)), $(filter
TRUE,$(SYSTEM_ODBC_HEADERS))), \
+ -DSQL_WCHART_CONVERT) \
))
$(eval $(call
gb_Library_set_precompiled_header,odbc,$(SRCDIR)/connectivity/inc/pch/precompiled_odbc))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
