Bug 794510: Part 1 - Build with NO_NSPR_10_SUPPORT by default; r=ehsan,glandium,wtc

config/config.mk

@@ -823,3 +823,5 @@ export CL_INCLUDES_PREFIX
 ifeq ($(MOZ_WIDGET_GTK),2)
 MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
 endif
+
+DEFINES += -DNO_NSPR_10_SUPPORT

js/src/Makefile.in

@@ -675,9 +675,6 @@ ifdef JS_VERSION
 DEFINES		+= -DJS_VERSION=$(JS_VERSION)
 endif
 
-# We do not want to have obsolete NSPR functionality in threadsafe builds.
-DEFINES   += -DNO_NSPR_10_SUPPORT
-
 ifneq ($(findstring -L,$(NSPR_LIBS)),)
 NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
 else

js/src/config/config.mk

@@ -823,3 +823,5 @@ export CL_INCLUDES_PREFIX
 ifeq ($(MOZ_WIDGET_GTK),2)
 MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk2/compat $(MOZ_GTK2_CFLAGS)
 endif
+
+DEFINES += -DNO_NSPR_10_SUPPORT

js/xpconnect/loader/Makefile.in

@@ -25,5 +25,4 @@ include $(topsrcdir)/config/rules.mk
 DEFINES += \
   -DJSFILE \
   -DJS_THREADSAFE \
-  -DNO_NSPR_10_SUPPORT \
   $(NULL)

js/xpconnect/shell/Makefile.in

@@ -50,10 +50,6 @@ endif
 
 LIBS +=	$(NSPR_LIBS)
 
-DEFINES += \
-  -DNO_NSPR_10_SUPPORT \
-  $(NULL)
-
 NSDISTMODE = copy
 
 ifdef _MSC_VER

js/xpconnect/src/Makefile.in

@@ -91,7 +91,6 @@ DEFINES += \
   -DJSFILE \
   -DJS_THREADSAFE \
   -DEXPORT_XPC_API \
-  -DNO_NSPR_10_SUPPORT \
   $(NULL)
 
 ifdef MOZ_JSDEBUGGER

js/xpconnect/wrappers/Makefile.in

@@ -27,8 +27,4 @@ LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
 
-DEFINES += \
-  -DNO_NSPR_10_SUPPORT \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

toolkit/xre/nsConsoleWriter.cpp

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifdef NO_NSPR_10_SUPPORT
-#undef NO_NSPR_10_SUPPORT
-#endif
-
 #include "NSPRFormatTime.h" // must include before any headers that include prtime.h
 #include "nsAppRunner.h"
 

widget/xpwidgets/Makefile.in

@@ -20,7 +20,6 @@ EXPORTS = \
 
 DEFINES += \
   -D_IMPL_NS_WIDGET \
-  -DNO_NSPR_10_SUPPORT=1 \
   $(NULL)
 
 CPPSRCS		= \