[Libreoffice-commits] core.git: external/liborcus

[Stephan Bergmann]

 external/liborcus/Library_orcus-parser.mk |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 6054cfcb6e8531791f3daaf5c78f60050b67e761
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 2 16:10:53 2015 +0100

    Revert "external/liborcus: Silence clang-cl errors about redeclared Windows functions"
    
    This reverts commit be0bf120299cff1ec14af1b578d4ea89976cea08, which is no longer
    needed after 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b "unnecessary include
    brings in boost headers that are broken under rhel-7"

diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
index 50c7f72..c3b4eec 100644
--- a/external/liborcus/Library_orcus-parser.mk
+++ b/external/liborcus/Library_orcus-parser.mk
@@ -29,13 +29,6 @@ $(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))