[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Library_file.mk

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Aug 9 04:11:29 PDT 2012


 connectivity/Library_file.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1eefb05e3f7d5be0e88aa4e31a03607322764f00
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 10 23:38:20 2012 +0200

    warning C4530: C++ exception handler used ... specify /EHsc
    
    Change-Id: Ifb23269c01dc80c328075fefe5e61b378e2d8477
    (cherry picked from commit 95d0593986a659475729e4a8b50242d05503116c)
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index b1757c1..900a48e 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,file,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_noexception_objects,file,\
-	connectivity/source/drivers/file/quotedstring \
-))
-
 $(eval $(call gb_Library_add_exception_objects,file,\
 	connectivity/source/drivers/file/FCatalog \
 	connectivity/source/drivers/file/FColumns \
@@ -79,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,file,\
 	connectivity/source/drivers/file/fanalyzer \
 	connectivity/source/drivers/file/fcode \
 	connectivity/source/drivers/file/fcomp \
+	connectivity/source/drivers/file/quotedstring \
 ))
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list