[Libreoffice-commits] core.git: svl/CppunitTest_svl_qa_cppunit.mk svl/qa

Stephan Bergmann sbergman at redhat.com
Fri May 18 05:54:22 UTC 2018


 svl/CppunitTest_svl_qa_cppunit.mk |    4 ----
 svl/qa/unit/svl.cxx               |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 7f31cac22125db5ec8cbd7520022fb7a38bafb1a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 17 18:05:10 2018 +0200

    Reuse existing config_host/config_libnumbertext.h.in
    
    Change-Id: I28d0260531132216c5f0bd187d400ed47cc43326
    Reviewed-on: https://gerrit.libreoffice.org/54498
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk
index 0cee925f85df..d364436eef2a 100644
--- a/svl/CppunitTest_svl_qa_cppunit.mk
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -27,10 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
 	icu_headers \
 ))
 
-$(eval $(call gb_CppunitTest_add_defs,svl_qa_cppunit, \
-    -DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \
-))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,svl_qa_cppunit, \
 	svl/qa/unit/svl \
 ))
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index b744e5a3bfbb..c944200ae23e 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -12,6 +12,7 @@
 #endif
 
 #include <sal/types.h>
+#include <config_libnumbertext.h>
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>


More information about the Libreoffice-commits mailing list