diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
| commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
| tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/nss/nss.windows.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip | |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/nss/nss.windows.patch')
| -rw-r--r-- | external/nss/nss.windows.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch new file mode 100644 index 000000000..27a440458 --- /dev/null +++ b/external/nss/nss.windows.patch @@ -0,0 +1,33 @@ +--- a/a/nspr/config/rules.mk 2008-12-03 00:24:39.000000000 +0100 ++++ b/b/nspr/config/rules.mk 2009-11-27 13:36:22.662753328 +0100 +@@ -423,7 +423,7 @@ + + ifdef NEED_ABSOLUTE_PATH + # The quotes allow absolute paths to contain spaces. +-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))" ++pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(CURDIR)/$(1))))" + endif + + $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp +--- a/a/nss/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100 ++++ b/b/nss/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100 +@@ -280,7 +280,7 @@ + endif + + # The quotes allow absolute paths to contain spaces. +-core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))' ++core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))' + + $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d + ifdef USE_NT_C_SYNTAX +--- a/a/nspr/pr/include/md/_win95.h ++++ b/b/nspr/pr/include/md/_win95.h +@@ -317,7 +317,7 @@ + #define _MD_ATOMIC_ADD(ptr,val) (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val) + #define _MD_ATOMIC_DECREMENT(x) InterlockedDecrement((PLONG)x) + #endif /* x86 */ +-#define _MD_ATOMIC_SET(x,y) InterlockedExchange((PLONG)x, (LONG)y) ++#define _MD_ATOMIC_SET(x,y) _InterlockedExchange((PLONG)x, (LONG)y) + + #define _MD_INIT_IO _PR_MD_INIT_IO + |