diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-01 11:51:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-02 08:02:25 +0100 |
| commit | be0bf120299cff1ec14af1b578d4ea89976cea08 (patch) | |
| tree | 44e8f8f2f8db9081af0f1caaadfbf3272bf2df7f /external/liborcus | |
| parent | 3aa5f100eb1402bea7896524f0f04dabdca65af7 (diff) | |
external/liborcus: Silence clang-cl errors about redeclared Windows functions
...like CreateMutexA redeclared in
workdir/UnpackedTarball/boost\boost/thread/win32/thread_primitives.hpp. As such
problematic Boost include files are apparently not included from LO-proper
source files, only from external, it looks easiest to just silence that with
BOOST_USE_WINDOWS_H here.
Change-Id: Ia5ec2325934e6d7fdcf91e6faa2e671aee2091ae
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/Library_orcus-parser.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk index c3b4eecde52d..50c7f72daaf2 100644 --- a/external/liborcus/Library_orcus-parser.mk +++ b/external/liborcus/Library_orcus-parser.mk @@ -29,6 +29,13 @@ $(eval $(call gb_Library_add_defs,orcus-parser,\ -DBOOST_ALL_NO_LIB \ -D__ORCUS_PSR_BUILDING_DLL \ )) +ifeq ($(OS),WNT) +ifeq ($(COM_IS_CLANG),TRUE) +$(eval $(call gb_Library_add_defs,orcus-parser, \ + -DBOOST_USE_WINDOWS_H \ +)) +endif +endif $(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp)) |