Bug 794510: Part 1 - Build with NO_NSPR_10_SUPPORT by default; r=ehsan,glandium,wtc
authorIsaac Aggrey <isaac.aggrey@gmail.com>
Thu, 11 Oct 2012 01:00:54 -0500
changeset 110910 677549e570d962427148a9715b39f424d9768096
parent 110909 a45fac177fc87ca8eed1bf403e4ccb28d4f8d8ff
child 110911 9394d94ea2b93bca0cbd13936df9cd8bee135062
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersehsan, glandium, wtc
bugs794510
milestone19.0a1
Bug 794510: Part 1 - Build with NO_NSPR_10_SUPPORT by default; r=ehsan,glandium,wtc
config/config.mk
js/src/Makefile.in
js/src/config/config.mk
js/xpconnect/loader/Makefile.in
js/xpconnect/shell/Makefile.in
js/xpconnect/src/Makefile.in
js/xpconnect/wrappers/Makefile.in
toolkit/xre/nsConsoleWriter.cpp
widget/xpwidgets/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -818,8 +818,10 @@ ifndef MOZ_SYSTEM_PLY
 PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
 endif
 
 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
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -670,19 +670,16 @@ ifdef JS_HAS_CTYPES
 DEFINES		+= -DJS_HAS_CTYPES
 DEFINES         += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
 endif
 
 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
 NSPR_STATIC_PATH = $(DIST)/lib
 endif
 
 ifdef MOZ_VTUNE
 #CXXFLAGS += -IC:/Program\ Files/Intel/VTune/Analyzer/Include
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -818,8 +818,10 @@ ifndef MOZ_SYSTEM_PLY
 PLY_INCLUDE = -I$(topsrcdir)/other-licenses/ply
 endif
 
 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
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -20,10 +20,9 @@ CPPSRCS		= mozJSComponentLoader.cpp mozJ
 
 EXTRA_JS_MODULES = XPCOMUtils.jsm ISO8601DateUtils.jsm
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
   -DJSFILE \
   -DJS_THREADSAFE \
-  -DNO_NSPR_10_SUPPORT \
   $(NULL)
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -45,20 +45,16 @@ LIBS		= \
 		$(NULL)
 
 ifdef JS_SHARED_LIBRARY
 LIBS +=	$(MOZ_JS_LIBS)
 endif
 
 LIBS +=	$(NSPR_LIBS)
 
-DEFINES += \
-  -DNO_NSPR_10_SUPPORT \
-  $(NULL)
-
 NSDISTMODE = copy
 
 ifdef _MSC_VER
 ifeq ($(OS_TEST),x86_64)
 # set stack to 2MB on x64 build.  See bug 582910
 WIN32_EXE_LDFLAGS += -STACK:2097152
 endif
 endif
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -86,17 +86,16 @@ SHARED_LIBRARY_LIBS = \
 EXTRA_MDDEPEND_FILES = dom_qsgen.pp dombindingsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
   -DJSFILE \
   -DJS_THREADSAFE \
   -DEXPORT_XPC_API \
-  -DNO_NSPR_10_SUPPORT \
   $(NULL)
 
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 nsXPConnect.$(OBJ_SUFFIX): dom_quickstubs.h
 
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -22,13 +22,9 @@ CPPSRCS = \
   XrayWrapper.cpp \
   WrapperFactory.cpp \
   $(NULL)
 
 LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
 
-DEFINES += \
-  -DNO_NSPR_10_SUPPORT \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/xre/nsConsoleWriter.cpp
+++ b/toolkit/xre/nsConsoleWriter.cpp
@@ -1,16 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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"
 
 #include "prio.h"
 #include "prprf.h"
 #include "prenv.h"
 
 #include "nsCRT.h"
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -15,17 +15,16 @@ LIBRARY_NAME	= xpwidgets_s
 LIBXUL_LIBRARY  = 1
 
 EXPORTS = \
 		GfxInfoCollector.h \
 		$(NULL)
 
 DEFINES += \
   -D_IMPL_NS_WIDGET \
-  -DNO_NSPR_10_SUPPORT=1 \
   $(NULL)
 
 CPPSRCS		= \
 		nsBaseAppShell.cpp \
 		nsBaseScreen.cpp \
 		nsBaseWidget.cpp \
 		nsTransferable.cpp \
 		nsHTMLFormatConverter.cpp \