Taichi Haradaguchi
a2969884af
Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
--- 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
|
|
|