1--- a/a/nspr/config/rules.mk 2008-12-03 00:24:39.000000000 +0100 2+++ b/b/nspr/config/rules.mk 2009-11-27 13:36:22.662753328 +0100 3@@ -415,7 +415,7 @@ 4 5 ifdef NEED_ABSOLUTE_PATH 6 # The quotes allow absolute paths to contain spaces. 7-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))" 8+pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(CURDIR)/$(1))))" 9 endif 10 11 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp 12--- a/a/nss/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100 13+++ b/b/nss/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100 14@@ -386,7 +386,7 @@ 15 endif 16 17 # The quotes allow absolute paths to contain spaces. 18-core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))' 19+core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))' 20 21 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d 22 ifdef USE_NT_C_SYNTAX 23--- a/a/nspr/pr/include/md/_win95.h 24+++ b/b/nspr/pr/include/md/_win95.h 25@@ -312,7 +312,7 @@ 26 #define _MD_ATOMIC_ADD(ptr,val) (InterlockedExchangeAdd((PLONG)ptr, (LONG)val) + val) 27 #define _MD_ATOMIC_DECREMENT(x) InterlockedDecrement((PLONG)x) 28 #endif /* x86 */ 29-#define _MD_ATOMIC_SET(x,y) InterlockedExchange((PLONG)x, (LONG)y) 30+#define _MD_ATOMIC_SET(x,y) _InterlockedExchange((PLONG)x, (LONG)y) 31 32 #define _MD_INIT_IO _PR_MD_INIT_IO 33 34