[Libreoffice-commits] core.git: xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/qa

[Miklos Vajna]

 xmlsecurity/CppunitTest_xmlsecurity_signing.mk |    1 +
 xmlsecurity/Module_xmlsecurity.mk              |    3 ---
 xmlsecurity/qa/unit/signing/signing.cxx        |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 29137eef25f437a1bcb9243cc9d86a6ae2277911
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jan 12 09:35:06 2016 +0100

    CppunitTest_xmlsecurity_signing: fix and enable on Windows
    
    Change-Id: Ie107afbb6b2499f445670b50bf214cb91d6b1cac

diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index 9cfa476..f7739ef 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_signing, \
 
 $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \
 	comphelper \
+	cppuhelper \
 	cppu \
 	sal \
 	sax \
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index beea26b..f5fb0ca 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -15,12 +15,9 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	$(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
 ))
 
-# FIXME find out what's the proper fix to get this linked on Windows
-ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
     CppunitTest_xmlsecurity_signing \
 ))
-endif
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
 	AllLangResTarget_xsec \
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 3c85fd4..785fa85 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -32,7 +32,7 @@
 #include <xmlsecurity/documentsignaturehelper.hxx>
 #include <xmlsecurity/xmlsignaturehelper.hxx>
 
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX)
 
 using namespace com::sun::star;