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

2024-09-13 09:24:08 -07:00 · 2012-10-11 01:00:54 -05:00 · 2012-10-11 01:00:54 -05:00 · 8c55998b7e
commit 8c55998b7e
parent bcc1ba760b
9 changed files with 4 additions and 18 deletions
--- a/config/config.mk
+++ b/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
--- a/js/src/Makefile.in
+++ b/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
--- a/js/src/config/config.mk
+++ b/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
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@ -25,5 +25,4 @@ 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
@ -50,10 +50,6 @@ endif

 LIBS +=	$(NSPR_LIBS)

-DEFINES += \
-  -DNO_NSPR_10_SUPPORT \
-  $(NULL)
-
 NSDISTMODE = copy

 ifdef _MSC_VER
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@ -91,7 +91,6 @@ DEFINES += \
  -DJSFILE \
  -DJS_THREADSAFE \
  -DEXPORT_XPC_API \
-  -DNO_NSPR_10_SUPPORT \
  $(NULL)

 ifdef MOZ_JSDEBUGGER
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/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
--- a/toolkit/xre/nsConsoleWriter.cpp
+++ b/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"

--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@ -20,7 +20,6 @@ EXPORTS = \

 DEFINES += \
  -D_IMPL_NS_WIDGET \
-  -DNO_NSPR_10_SUPPORT=1 \
  $(NULL)

 CPPSRCS		= \