svl/source/crypto/cryptosign.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d8a6996f1118b5697cc8b2842bf90c46e423a9ae
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Jul 16 16:38:02 2017 -0400
svl: fix Android build where no NSS exists
Change-Id: I031b3efd4cf203cda0a69341e8c47b36cc7cfe37
Reviewed-on: https://gerrit.libreoffice.org/40013
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index d5304e5e2d2a..7d3096d637a3 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -80,7 +80,8 @@ void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer )
rBuffer.append( pHexDigits[ nInt & 15 ] );
}
-#ifndef _WIN32
+#if HAVE_FEATURE_NSS && !defined(_WIN32)
+
char *PDFSigningPKCS7PasswordCallback(PK11SlotInfo * /*slot*/, PRBool
/*retry*/, void *arg)
{
return PL_strdup(static_cast<char *>(arg));
@@ -694,7 +695,8 @@ NSSCMSMessage *CreateCMSMessage(const PRTime* time,
return result;
}
-#endif //!_WIN32
+#endif // HAVE_FEATURE_NSS && !_WIN32
+
} // Anonymous namespace
#ifdef _WIN32
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
