[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/com_GCC_defs.mk |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 500acced7c900b34fdd78139ecfd5e921309c304
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 11 17:26:43 2015 +0200

    Revert "Silence Clang -Werror,-Wreturn-type-c-linkage"
    
    This reverts commit f14cedc4fd7ba784da3f7ca067a1af18b758e368, now that
    667910530deb61563d4812db0995da94e25220e5 reverted
    9f016bd69422bdfb4cf7c4f5e57356eb98db2d8c again.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 1bb4017..5b5a2bd 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -72,14 +72,6 @@ gb_CXXFLAGS_COMMON := \
 	-fno-common \
 	-pipe \
 
-# VCL_BUILDER_DECL_FACTORY (include/vcl/builderfactory.hxx) routinely causes
-# "'make...' has C-linkage specified, but returns user-defined type
-# 'VclPtr<vcl::Window>' which is incompatible with C
-# [-Werror,-Wreturn-type-c-linkage]":
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
-gb_CXXFLAGS_COMMON += -Wno-return-type-c-linkage
-endif
-
 gb_CXXFLAGS_Wundef = -Wno-undef
 
 ifneq ($(HAVE_THREADSAFE_STATICS),TRUE)