diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
commit | 267c6f2ac71f92999e969232431ba04678e7437e (patch) | |
tree | 358c9467650e1d0a1d7227a21dac2e3d08b622b2 /external/nss/nss.vs2015.patch | |
parent | Initial commit. (diff) | |
download | libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.tar.xz libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.zip |
Adding upstream version 4:24.2.0.upstream/4%24.2.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/nss/nss.vs2015.patch')
-rw-r--r-- | external/nss/nss.vs2015.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch new file mode 100644 index 0000000000..73cff7c833 --- /dev/null +++ b/external/nss/nss.vs2015.patch @@ -0,0 +1,12 @@ +diff -ru nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk +--- a/nss.org/nss/coreconf/WIN32.mk 2016-02-12 15:36:18.000000000 +0100 ++++ b/nss/nss/coreconf/WIN32.mk 2016-02-26 00:42:43.170809600 +0100 +@@ -192,7 +192,7 @@ + # Disable C4244: conversion from 'type1' to 'type2', possible loss of data + # Disable C4018: 'expression' : signed/unsigned mismatch + # Disable C4312: 'type cast': conversion from 'type1' to 'type2' of greater size +- OS_CFLAGS += -w44267 -w44244 -w44018 -w44312 ++ OS_CFLAGS += -w44267 -w44244 -w44018 -w44312 -wd4996 -wd4554 + ifeq ($(_MSC_VER_GE_12),1) + OS_CFLAGS += -FS + endif |