external/nss/clang-cl.patch.0 | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 2f39a7b8f90a65d0be9894a0edcf01c161289459
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 29 09:21:51 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 29 13:25:53 2021 +0200
external/nss: More -Werror,-Wunknown-pragmas with clang-cl
> In file included from
C:/lo-clang/core/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx:28:
> In file included from
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss\pk11pub.h:12:
> In file included from
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss/pk11hpke.h:8:
>
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss/blapit.h(66,9):
error: unknown pragma ignored [-Werror,-Wunknown-pragmas]
> #pragma deprecated(DSA_SUBPRIME_LEN, DSA_SIGNATURE_LEN, DSA_QBITS)
> ^
Change-Id: If84d8640d770ed20a6492678a9bc7fe4f4a547f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124407
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 1d615c2397d8..b02fff60e36b 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -61,6 +61,17 @@
#pragma deprecated(CERTDB_VALID_PEER)
#endif
#define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
+--- nss/lib/freebl/blapit.h
++++ nss/lib/freebl/blapit.h
+@@ -53,7 +53,7 @@
+ * Mark the old defines as deprecated. This will warn code that expected
+ * DSA1 only that they need to change if the are to support DSA2.
+ */
+-#if defined(__GNUC__) && (__GNUC__ > 3)
++#if defined(__GNUC__) && (__GNUC__ > 3) || defined __clang__
+ /* make GCC warn when we use these #defines */
+ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
+ #define DSA_SUBPRIME_LEN ((__BLAPI_DEPRECATED)DSA1_SUBPRIME_LEN)
--- nss/lib/util/pkcs11n.h
+++ nss/lib/util/pkcs11n.h
@@ -426,7 +426,7 @@
