From f8f5bda2bef72b4d90d1df0c8491c87c59ec954f Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Wed, 8 Jul 2009 23:18:36 +0000 Subject: [PATCH] Changes to MOZ_APP_NAME, which allows the build system to produce distribution archives with the BeZilla name. Possibly end of patch work for now. --- .../bezilla-patches-2009-07-07.diff | 291 +++++++++++------- 1 file changed, 173 insertions(+), 118 deletions(-) diff --git a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff b/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff index b5760909e..31d64a41c 100644 --- a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff +++ b/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff @@ -1,12 +1,8 @@ ? mozilla/browser/app/apprunner-beos.rdef -? mozilla/browser/base/content/dynamic-welcome-version1.html -? mozilla/browser/base/content/dynamic-welcome-version2.html ? mozilla/browser/installer/beos ? mozilla/calendar/sunbird/app/apprunner-beos.rdef ? mozilla/calendar/sunbird/app/apprunner-beos.rsrc ? mozilla/mail/app/apprunner-beos.rdef -? mozilla/nsprpub/pr/src/bthreads/btfile.c -? mozilla/nsprpub/pr/src/bthreads/btio.c ? mozilla/xpfe/bootstrap/apprunner-beos.rdef Index: mozilla/configure.in =================================================================== @@ -14,7 +10,7 @@ RCS file: /cvsroot/mozilla/configure.in,v retrieving revision 1.1503.2.112 diff -u -8 -p -w -r1.1503.2.112 configure.in --- mozilla/configure.in 19 Oct 2008 16:14:06 -0000 1.1503.2.112 -+++ mozilla/configure.in 8 Jul 2009 19:18:42 -0000 ++++ mozilla/configure.in 8 Jul 2009 21:49:32 -0000 @@ -1333,17 +1333,17 @@ if test "$HAVE_64BIT_OS"; then fi AC_LANG_RESTORE @@ -82,6 +78,84 @@ diff -u -8 -p -w -r1.1503.2.112 configure.in ;; *-bsdi*) +@@ -4300,31 +4318,31 @@ MOZ_ARG_ENABLE_STRING(application, + xulrunner + macbrowser (Camino) + standalone (use this for standalone + xpcom/xpconnect or to manually drive a build)], + [ MOZ_BUILD_APP=$enableval ] ) + + case "$MOZ_BUILD_APP" in + suite) +- MOZ_APP_NAME=seamonkey +- MOZ_APP_DISPLAYNAME=SeaMonkey ++ MOZ_APP_NAME=BeZillaSuite ++ MOZ_APP_DISPLAYNAME=BeZillaSuite + MOZ_MAIL_NEWS=1 + MOZ_LDAP_XPCOM=1 + MOZ_COMPOSER=1 + MOZ_SUITE=1 + MOZ_PROFILESHARING= + MOZ_APP_VERSION=$SEAMONKEY_VERSION + MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter" + AC_DEFINE(MOZ_SUITE) + ;; + + browser) +- MOZ_APP_NAME=firefox +- MOZ_APP_DISPLAYNAME=BonEcho ++ MOZ_APP_NAME=BeZillaBrowser ++ MOZ_APP_DISPLAYNAME=BeZillaBrowser + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_SAFE_BROWSING=1 + MOZ_APP_VERSION=$FIREFOX_VERSION + MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter spellcheck" + AC_DEFINE(MOZ_PHOENIX) + ;; + +@@ -4375,18 +4393,18 @@ minimo) + NECKO_SMALL_BUFFERS=1 + NS_DISABLE_LOGGING=1 + NS_PRINTING= + MOZ_WEBSERVICES= + JS_STATIC_BUILD=1 + ;; + + mail) +- MOZ_APP_NAME=thunderbird +- MOZ_APP_DISPLAYNAME=Thunderbird ++ MOZ_APP_NAME=BeZillaMailNews ++ MOZ_APP_DISPLAYNAME=BeZillaMailNews + MOZ_XUL_APP=1 + MOZ_THUNDERBIRD=1 + MOZ_MATHML= + MOZ_NO_ACTIVEX_SUPPORT=1 + MOZ_ACTIVEX_SCRIPTING_SUPPORT= + ENABLE_TESTS= + MOZ_OJI= + MOZ_PLUGINS= +@@ -4410,18 +4428,18 @@ composer) + MOZ_XUL_APP=1 + MOZ_STANDALONE_COMPOSER=1 + MOZ_COMPOSER=1 + MOZ_APP_VERSION=0.17+ + AC_DEFINE(MOZ_STANDALONE_COMPOSER) + ;; + + calendar) +- MOZ_APP_NAME=sunbird +- MOZ_APP_DISPLAYNAME=Calendar ++ MOZ_APP_NAME=BeZillaCalendar ++ MOZ_APP_DISPLAYNAME=BeZillaCalendar + MOZ_XUL_APP=1 + MOZ_SUNBIRD=1 + MOZ_CALENDAR=1 + MOZ_APP_VERSION=$SUNBIRD_VERSION + MOZ_PLAINTEXT_EDITOR_ONLY=1 + NECKO_PROTOCOLS_DEFAULT="about http ftp file res viewsource" + MOZ_NO_ACTIVEX_SUPPORT=1 + MOZ_ACTIVEX_SCRIPTING_SUPPORT= @@ -5235,17 +5253,17 @@ fi dnl Remove dupes @@ -165,7 +239,7 @@ RCS file: /cvsroot/mozilla/browser/app/Makefile.in,v retrieving revision 1.85.2.12 diff -u -8 -p -w -r1.85.2.12 Makefile.in --- mozilla/browser/app/Makefile.in 12 May 2008 18:25:50 -0000 1.85.2.12 -+++ mozilla/browser/app/Makefile.in 8 Jul 2009 19:18:45 -0000 ++++ mozilla/browser/app/Makefile.in 8 Jul 2009 21:49:35 -0000 @@ -59,18 +59,22 @@ endif # hardcode en-US for the moment AB_CD = en-US @@ -236,7 +310,7 @@ RCS file: /cvsroot/mozilla/browser/app/firefox-branding.js,v retrieving revision 1.1.2.2 diff -u -8 -p -w -r1.1.2.2 firefox-branding.js --- mozilla/browser/app/firefox-branding.js 12 Sep 2006 15:50:19 -0000 1.1.2.2 -+++ mozilla/browser/app/firefox-branding.js 8 Jul 2009 19:18:45 -0000 ++++ mozilla/browser/app/firefox-branding.js 8 Jul 2009 21:49:35 -0000 @@ -1,16 +1,15 @@ pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); @@ -261,7 +335,7 @@ RCS file: /cvsroot/mozilla/browser/base/jar.mn,v retrieving revision 1.95.2.13 diff -u -8 -p -w -r1.95.2.13 jar.mn --- mozilla/browser/base/jar.mn 13 Sep 2006 23:10:10 -0000 1.95.2.13 -+++ mozilla/browser/base/jar.mn 8 Jul 2009 19:18:46 -0000 ++++ mozilla/browser/base/jar.mn 8 Jul 2009 21:49:35 -0000 @@ -11,16 +11,22 @@ browser.jar: % overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul * content/browser/aboutDialog.xul (content/aboutDialog.xul) @@ -291,7 +365,7 @@ RCS file: /cvsroot/mozilla/browser/base/content/browserconfig.properties,v retrieving revision 1.4.4.1 diff -u -8 -p -w -r1.4.4.1 browserconfig.properties --- mozilla/browser/base/content/browserconfig.properties 17 Mar 2006 04:17:56 -0000 1.4.4.1 -+++ mozilla/browser/base/content/browserconfig.properties 8 Jul 2009 19:18:46 -0000 ++++ mozilla/browser/base/content/browserconfig.properties 8 Jul 2009 21:49:35 -0000 @@ -1,2 +1,2 @@ # Do NOT localize or otherwise change these values -browser.startup.homepage=http://www.mozilla.org/projects/bonecho/ @@ -302,7 +376,7 @@ RCS file: /cvsroot/mozilla/browser/components/migration/src/Makefile.in,v retrieving revision 1.20.2.2 diff -u -8 -p -w -r1.20.2.2 Makefile.in --- mozilla/browser/components/migration/src/Makefile.in 27 Jan 2006 02:19:00 -0000 1.20.2.2 -+++ mozilla/browser/components/migration/src/Makefile.in 8 Jul 2009 19:18:47 -0000 ++++ mozilla/browser/components/migration/src/Makefile.in 8 Jul 2009 21:49:37 -0000 @@ -73,20 +73,23 @@ endif CPPSRCS = nsProfileMigrator.cpp \ @@ -334,7 +408,7 @@ RCS file: /cvsroot/mozilla/browser/installer/Makefile.in,v retrieving revision 1.19.4.4 diff -u -8 -p -w -r1.19.4.4 Makefile.in --- mozilla/browser/installer/Makefile.in 6 Jun 2006 15:35:00 -0000 1.19.4.4 -+++ mozilla/browser/installer/Makefile.in 8 Jul 2009 19:18:50 -0000 ++++ mozilla/browser/installer/Makefile.in 8 Jul 2009 21:49:39 -0000 @@ -57,19 +57,23 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in @@ -365,7 +439,7 @@ RCS file: /cvsroot/mozilla/browser/locales/en-US/profile/bookmarks.html,v retrieving revision 1.4.8.13 diff -u -8 -p -w -r1.4.8.13 bookmarks.html --- mozilla/browser/locales/en-US/profile/bookmarks.html 19 Aug 2006 06:04:11 -0000 1.4.8.13 -+++ mozilla/browser/locales/en-US/profile/bookmarks.html 8 Jul 2009 19:18:51 -0000 ++++ mozilla/browser/locales/en-US/profile/bookmarks.html 8 Jul 2009 21:49:40 -0000 @@ -7,20 +7,37 @@

Bookmarks

@@ -417,7 +491,7 @@ RCS file: /cvsroot/mozilla/build/autoconf/config.guess,v retrieving revision 1.19 diff -u -8 -p -w -r1.19 config.guess --- mozilla/build/autoconf/config.guess 18 Apr 2003 10:20:15 -0000 1.19 -+++ mozilla/build/autoconf/config.guess 8 Jul 2009 19:18:57 -0000 ++++ mozilla/build/autoconf/config.guess 8 Jul 2009 21:49:46 -0000 @@ -1,34 +1,37 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -1984,7 +2058,7 @@ RCS file: /cvsroot/mozilla/build/autoconf/config.sub,v retrieving revision 1.20 diff -u -8 -p -w -r1.20 config.sub --- mozilla/build/autoconf/config.sub 18 Apr 2003 10:20:15 -0000 1.20 -+++ mozilla/build/autoconf/config.sub 8 Jul 2009 19:18:59 -0000 ++++ mozilla/build/autoconf/config.sub 8 Jul 2009 21:49:49 -0000 @@ -1,14 +1,15 @@ #! /bin/sh # Configuration validation subroutine script. @@ -3123,7 +3197,7 @@ RCS file: /cvsroot/mozilla/calendar/base/content/preferences/preferences.xul,v retrieving revision 1.1.2.6 diff -u -8 -p -w -r1.1.2.6 preferences.xul --- mozilla/calendar/base/content/preferences/preferences.xul 14 Mar 2007 09:08:19 -0000 1.1.2.6 -+++ mozilla/calendar/base/content/preferences/preferences.xul 8 Jul 2009 19:19:01 -0000 ++++ mozilla/calendar/base/content/preferences/preferences.xul 8 Jul 2009 21:49:51 -0000 @@ -66,17 +66,22 @@ #ifdef XP_UNIX #ifdef XP_MACOSX @@ -3153,7 +3227,7 @@ RCS file: /cvsroot/mozilla/calendar/libical/src/libical/Makefile.in,v retrieving revision 1.3.6.1 diff -u -8 -p -w -r1.3.6.1 Makefile.in --- mozilla/calendar/libical/src/libical/Makefile.in 27 Dec 2007 10:03:57 -0000 1.3.6.1 -+++ mozilla/calendar/libical/src/libical/Makefile.in 8 Jul 2009 19:19:03 -0000 ++++ mozilla/calendar/libical/src/libical/Makefile.in 8 Jul 2009 21:49:54 -0000 @@ -84,17 +84,17 @@ CSRCS = \ $(NULL) @@ -3179,7 +3253,7 @@ RCS file: /cvsroot/mozilla/calendar/sunbird/app/Makefile.in,v retrieving revision 1.21.2.23 diff -u -8 -p -w -r1.21.2.23 Makefile.in --- mozilla/calendar/sunbird/app/Makefile.in 4 May 2008 01:32:07 -0000 1.21.2.23 -+++ mozilla/calendar/sunbird/app/Makefile.in 8 Jul 2009 19:19:08 -0000 ++++ mozilla/calendar/sunbird/app/Makefile.in 8 Jul 2009 21:50:01 -0000 @@ -79,18 +79,22 @@ include $(topsrcdir)/config/rules.mk else # Build a binary bootstrapping with XRE_main @@ -3251,7 +3325,7 @@ RCS file: /cvsroot/mozilla/config/config.mk,v retrieving revision 3.337.2.12 diff -u -8 -p -w -r3.337.2.12 config.mk --- mozilla/config/config.mk 23 Nov 2007 21:12:26 -0000 3.337.2.12 -+++ mozilla/config/config.mk 8 Jul 2009 19:19:19 -0000 ++++ mozilla/config/config.mk 8 Jul 2009 21:50:14 -0000 @@ -105,19 +105,16 @@ AUTOCONF_TOOLS = $(topsrcdir)/build/auto ifeq ($(OS_ARCH),QNX) @@ -3278,26 +3352,7 @@ RCS file: /cvsroot/mozilla/config/rules.mk,v retrieving revision 3.487.2.9 diff -u -8 -p -w -r3.487.2.9 rules.mk --- mozilla/config/rules.mk 18 Dec 2007 21:33:08 -0000 3.487.2.9 -+++ mozilla/config/rules.mk 8 Jul 2009 19:19:23 -0000 -@@ -161,17 +161,17 @@ SHARED_LIBRARY := $(NULL) - DEF_FILE := $(NULL) - IMPORT_LIBRARY := $(NULL) - endif - endif - - ifdef FORCE_SHARED_LIB - ifndef FORCE_STATIC_LIB - LIBRARY := $(NULL) --endif -+xendif - endif - - ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) - ifndef GNU_CC - - # Previously when possible we wrote to $LIBRARY_NAME.pdb. This broke parallel - # make builds on Windows. Now we just write to a pdb file per compiled file. - # See bug 286179 for ++++ mozilla/config/rules.mk 8 Jul 2009 21:50:19 -0000 @@ -512,17 +512,17 @@ ifeq ($(OS_ARCH),Linux) ifdef IS_COMPONENT EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic @@ -3370,7 +3425,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/build.mk,v retrieving revision 5.0.2.15.4.1 diff -u -8 -p -w -r5.0.2.15.4.1 build.mk --- mozilla/directory/c-sdk/build.mk 3 Feb 2006 14:44:29 -0000 5.0.2.15.4.1 -+++ mozilla/directory/c-sdk/build.mk 8 Jul 2009 19:19:32 -0000 ++++ mozilla/directory/c-sdk/build.mk 8 Jul 2009 21:50:28 -0000 @@ -437,17 +437,17 @@ endif #!os2 ifeq ($(OS_ARCH), OSF1) @@ -3396,7 +3451,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v retrieving revision 5.0.2.34.4.3 diff -u -8 -p -w -r5.0.2.34.4.3 configure.in --- mozilla/directory/c-sdk/configure.in 11 Jul 2007 20:43:19 -0000 5.0.2.34.4.3 -+++ mozilla/directory/c-sdk/configure.in 8 Jul 2009 19:19:39 -0000 ++++ mozilla/directory/c-sdk/configure.in 8 Jul 2009 21:50:33 -0000 @@ -355,17 +355,17 @@ fi if test -z "$SKIP_PATH_CHECKS"; then AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami) @@ -3517,7 +3572,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf/config.guess,v retrieving revision 5.0.2.2 diff -u -8 -p -w -r5.0.2.2 config.guess --- mozilla/directory/c-sdk/config/autoconf/config.guess 18 Apr 2003 10:20:22 -0000 5.0.2.2 -+++ mozilla/directory/c-sdk/config/autoconf/config.guess 8 Jul 2009 19:19:43 -0000 ++++ mozilla/directory/c-sdk/config/autoconf/config.guess 8 Jul 2009 21:50:37 -0000 @@ -1,34 +1,37 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -5084,7 +5139,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf/config.sub,v retrieving revision 5.0.2.3 diff -u -8 -p -w -r5.0.2.3 config.sub --- mozilla/directory/c-sdk/config/autoconf/config.sub 18 Apr 2003 10:20:22 -0000 5.0.2.3 -+++ mozilla/directory/c-sdk/config/autoconf/config.sub 8 Jul 2009 19:19:46 -0000 ++++ mozilla/directory/c-sdk/config/autoconf/config.sub 8 Jul 2009 21:50:40 -0000 @@ -1,14 +1,15 @@ #! /bin/sh # Configuration validation subroutine script. @@ -6223,7 +6278,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in,v retrieving revision 5.0.2.21.4.1 diff -u -8 -p -w -r5.0.2.21.4.1 Makefile.in --- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 3 Feb 2006 14:44:42 -0000 5.0.2.21.4.1 -+++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 8 Jul 2009 19:19:48 -0000 ++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 8 Jul 2009 21:50:42 -0000 @@ -232,17 +232,17 @@ ifeq ($(OS_ARCH), Darwin) EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) endif @@ -6288,7 +6343,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in, retrieving revision 5.0.2.18.4.1 diff -u -8 -p -w -r5.0.2.18.4.1 Makefile.in --- mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 3 Feb 2006 14:44:49 -0000 5.0.2.18.4.1 -+++ mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 8 Jul 2009 19:19:49 -0000 ++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 8 Jul 2009 21:50:43 -0000 @@ -160,17 +160,18 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L EXTRA_LIBS += -L$(dist_libdir) $(DYNAMICNSPR) endif @@ -6330,7 +6385,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libssldap/Attic/Makefi retrieving revision 5.0.2.8 diff -u -8 -p -w -r5.0.2.8 Makefile --- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 25 Aug 2004 23:02:30 -0000 5.0.2.8 -+++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 8 Jul 2009 19:19:50 -0000 ++++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile 8 Jul 2009 21:50:43 -0000 @@ -162,17 +162,17 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L ifeq ($(NSS_DYNAMIC_SOFTOKN),1) EXTRA_LIBS += -l$(SOFTOKN_LIBNAME) @@ -6356,7 +6411,7 @@ RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in, retrieving revision 5.0.2.9.4.1 diff -u -8 -p -w -r5.0.2.9.4.1 Makefile.in --- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 3 Feb 2006 14:44:49 -0000 5.0.2.9.4.1 -+++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 8 Jul 2009 19:19:51 -0000 ++++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in 8 Jul 2009 21:50:44 -0000 @@ -177,17 +177,17 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_L ifeq ($(NSS_DYNAMIC_SOFTOKN),1) EXTRA_LIBS += -l$(SOFTOKN_LIBNAME) @@ -6382,7 +6437,7 @@ RCS file: /cvsroot/mozilla/embedding/componentlib/Makefile.in,v retrieving revision 1.3 diff -u -8 -p -w -r1.3 Makefile.in --- mozilla/embedding/componentlib/Makefile.in 18 Apr 2004 22:00:41 -0000 1.3 -+++ mozilla/embedding/componentlib/Makefile.in 8 Jul 2009 19:20:02 -0000 ++++ mozilla/embedding/componentlib/Makefile.in 8 Jul 2009 21:50:58 -0000 @@ -147,17 +147,17 @@ OS_LIBS := -lstdc++ $(OS_LIBS) SHLIB_LDENDFILE = -lgcc @@ -6408,7 +6463,7 @@ RCS file: /cvsroot/mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp,v retrieving revision 1.40.12.5 diff -u -8 -p -w -r1.40.12.5 nsFontMetricsBeOS.cpp --- mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 27 Sep 2007 21:36:00 -0000 1.40.12.5 -+++ mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 8 Jul 2009 19:20:25 -0000 ++++ mozilla/gfx/src/beos/nsFontMetricsBeOS.cpp 8 Jul 2009 21:51:31 -0000 @@ -123,22 +123,22 @@ NS_IMETHODIMP nsFontMetricsBeOS::Init(co nsString *fam = param.family.StringAt(i); PRBool isgeneric = ( param.isgeneric[i] ) ? PR_TRUE: PR_FALSE; @@ -6483,7 +6538,7 @@ RCS file: /cvsroot/mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp,v retrieving revision 1.51.12.8 diff -u -8 -p -w -r1.51.12.8 nsRenderingContextBeOS.cpp --- mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 18 Dec 2007 07:17:21 -0000 1.51.12.8 -+++ mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 8 Jul 2009 19:20:28 -0000 ++++ mozilla/gfx/src/beos/nsRenderingContextBeOS.cpp 8 Jul 2009 21:51:35 -0000 @@ -346,18 +346,21 @@ bool nsRenderingContextBeOS::LockAndUpda // Intelligent lock @@ -6552,7 +6607,7 @@ RCS file: /cvsroot/mozilla/intl/uconv/src/Makefile.in,v retrieving revision 1.82.4.2 diff -u -8 -p -w -r1.82.4.2 Makefile.in --- mozilla/intl/uconv/src/Makefile.in 29 Jan 2006 16:51:01 -0000 1.82.4.2 -+++ mozilla/intl/uconv/src/Makefile.in 8 Jul 2009 19:20:32 -0000 ++++ mozilla/intl/uconv/src/Makefile.in 8 Jul 2009 21:51:42 -0000 @@ -114,17 +114,17 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),windows) CPPSRCS += nsWinCharset.cpp @@ -6578,7 +6633,7 @@ RCS file: /cvsroot/mozilla/ipc/ipcd/client/src/Makefile.in,v retrieving revision 1.7 diff -u -8 -p -w -r1.7 Makefile.in --- mozilla/ipc/ipcd/client/src/Makefile.in 9 Dec 2004 19:28:19 -0000 1.7 -+++ mozilla/ipc/ipcd/client/src/Makefile.in 8 Jul 2009 19:20:36 -0000 ++++ mozilla/ipc/ipcd/client/src/Makefile.in 8 Jul 2009 21:51:48 -0000 @@ -59,17 +59,18 @@ CPPSRCS = \ ipcdclient.cpp \ ipcService.cpp \ @@ -6605,7 +6660,7 @@ RCS file: /cvsroot/mozilla/ipc/ipcd/daemon/src/Makefile.in,v retrieving revision 1.3 diff -u -8 -p -w -r1.3 Makefile.in --- mozilla/ipc/ipcd/daemon/src/Makefile.in 28 Jan 2004 21:31:46 -0000 1.3 -+++ mozilla/ipc/ipcd/daemon/src/Makefile.in 8 Jul 2009 19:20:37 -0000 ++++ mozilla/ipc/ipcd/daemon/src/Makefile.in 8 Jul 2009 21:51:49 -0000 @@ -54,17 +54,18 @@ CPPSRCS = \ ipcd.cpp \ ipcClient.cpp \ @@ -6632,7 +6687,7 @@ RCS file: /cvsroot/mozilla/js/src/Makefile.in,v retrieving revision 3.95.4.5 diff -u -8 -p -w -r3.95.4.5 Makefile.in --- mozilla/js/src/Makefile.in 27 Jul 2006 22:56:20 -0000 3.95.4.5 -+++ mozilla/js/src/Makefile.in 8 Jul 2009 19:20:39 -0000 ++++ mozilla/js/src/Makefile.in 8 Jul 2009 21:51:51 -0000 @@ -241,17 +241,17 @@ ifneq ($(findstring -L,$(NSPR_LIBS)),) NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS))) else @@ -6658,7 +6713,7 @@ RCS file: /cvsroot/mozilla/mail/app/Makefile.in,v retrieving revision 1.46.2.10 diff -u -8 -p -w -r1.46.2.10 Makefile.in --- mozilla/mail/app/Makefile.in 22 Oct 2008 21:04:53 -0000 1.46.2.10 -+++ mozilla/mail/app/Makefile.in 8 Jul 2009 19:20:58 -0000 ++++ mozilla/mail/app/Makefile.in 8 Jul 2009 21:52:18 -0000 @@ -57,18 +57,22 @@ PREF_JS_EXPORTS = \ ifndef MOZ_BRANDING_DIRECTORY @@ -6729,7 +6784,7 @@ RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/Makefile.in,v retrieving revision 1.13.18.2 diff -u -8 -p -w -r1.13.18.2 Makefile.in --- mozilla/modules/libpr0n/decoders/Makefile.in 17 Feb 2006 19:03:47 -0000 1.13.18.2 -+++ mozilla/modules/libpr0n/decoders/Makefile.in 8 Jul 2009 19:21:16 -0000 ++++ mozilla/modules/libpr0n/decoders/Makefile.in 8 Jul 2009 21:52:37 -0000 @@ -47,17 +47,17 @@ ifdef MOZ_ENABLE_GNOMEUI TOOL_DIRS = icon/gtk icon endif @@ -6755,7 +6810,7 @@ RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/icon/Makefile.in,v retrieving revision 1.17.8.6 diff -u -8 -p -w -r1.17.8.6 Makefile.in --- mozilla/modules/libpr0n/decoders/icon/Makefile.in 30 May 2006 15:46:21 -0000 1.17.8.6 -+++ mozilla/modules/libpr0n/decoders/icon/Makefile.in 8 Jul 2009 19:21:16 -0000 ++++ mozilla/modules/libpr0n/decoders/icon/Makefile.in 8 Jul 2009 21:52:37 -0000 @@ -77,17 +77,17 @@ endif ifeq ($(OS_ARCH),OS2) PLATFORM = os2 @@ -6800,7 +6855,7 @@ RCS file: /cvsroot/mozilla/modules/libreg/src/Makefile.in,v retrieving revision 1.39 diff -u -8 -p -w -r1.39 Makefile.in --- mozilla/modules/libreg/src/Makefile.in 18 Apr 2004 22:00:45 -0000 1.39 -+++ mozilla/modules/libreg/src/Makefile.in 8 Jul 2009 19:21:17 -0000 ++++ mozilla/modules/libreg/src/Makefile.in 8 Jul 2009 21:52:38 -0000 @@ -61,17 +61,17 @@ FORCE_STATIC_LIB = 1 # Force use of PIC @@ -6826,7 +6881,7 @@ RCS file: /cvsroot/mozilla/modules/plugin/base/src/Makefile.in,v retrieving revision 1.104 diff -u -8 -p -w -r1.104 Makefile.in --- mozilla/modules/plugin/base/src/Makefile.in 8 Jun 2005 16:48:43 -0000 1.104 -+++ mozilla/modules/plugin/base/src/Makefile.in 8 Jul 2009 19:21:24 -0000 ++++ mozilla/modules/plugin/base/src/Makefile.in 8 Jul 2009 21:52:43 -0000 @@ -91,17 +91,17 @@ CPPSRCS = \ ns4xPluginInstance.cpp \ nsPluginHostImpl.cpp \ @@ -6852,7 +6907,7 @@ RCS file: /cvsroot/mozilla/nsprpub/configure.in,v retrieving revision 1.199.2.17 diff -u -8 -p -w -r1.199.2.17 configure.in --- mozilla/nsprpub/configure.in 31 Oct 2007 18:07:38 -0000 1.199.2.17 -+++ mozilla/nsprpub/configure.in 8 Jul 2009 19:21:35 -0000 ++++ mozilla/nsprpub/configure.in 8 Jul 2009 21:52:54 -0000 @@ -358,17 +358,17 @@ if test -z "$SKIP_PATH_CHECKS"; then AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami) fi @@ -6991,7 +7046,7 @@ RCS file: /cvsroot/mozilla/nsprpub/build/autoconf/config.guess,v retrieving revision 1.15 diff -u -8 -p -w -r1.15 config.guess --- mozilla/nsprpub/build/autoconf/config.guess 18 Apr 2003 19:20:18 -0000 1.15 -+++ mozilla/nsprpub/build/autoconf/config.guess 8 Jul 2009 19:21:38 -0000 ++++ mozilla/nsprpub/build/autoconf/config.guess 8 Jul 2009 21:52:57 -0000 @@ -1,34 +1,37 @@ #! /bin/sh # Attempt to guess a canonical system name. @@ -8558,7 +8613,7 @@ RCS file: /cvsroot/mozilla/nsprpub/build/autoconf/config.sub,v retrieving revision 1.16 diff -u -8 -p -w -r1.16 config.sub --- mozilla/nsprpub/build/autoconf/config.sub 18 Apr 2003 19:20:18 -0000 1.16 -+++ mozilla/nsprpub/build/autoconf/config.sub 8 Jul 2009 19:21:40 -0000 ++++ mozilla/nsprpub/build/autoconf/config.sub 8 Jul 2009 21:52:59 -0000 @@ -1,14 +1,15 @@ #! /bin/sh # Configuration validation subroutine script. @@ -9697,7 +9752,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/ds/Makefile.in,v retrieving revision 1.35.2.1 diff -u -8 -p -w -r1.35.2.1 Makefile.in --- mozilla/nsprpub/lib/ds/Makefile.in 19 Oct 2006 00:39:28 -0000 1.35.2.1 -+++ mozilla/nsprpub/lib/ds/Makefile.in 8 Jul 2009 19:21:40 -0000 ++++ mozilla/nsprpub/lib/ds/Makefile.in 8 Jul 2009 21:52:59 -0000 @@ -180,18 +180,22 @@ endif export:: $(TARGETS) $(INSTALL) -m 444 $(HEADERS) $(dist_includedir) @@ -9727,7 +9782,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/libc/src/Makefile.in,v retrieving revision 1.31.2.1 diff -u -8 -p -w -r1.31.2.1 Makefile.in --- mozilla/nsprpub/lib/libc/src/Makefile.in 19 Oct 2006 00:39:28 -0000 1.31.2.1 -+++ mozilla/nsprpub/lib/libc/src/Makefile.in 8 Jul 2009 19:21:41 -0000 ++++ mozilla/nsprpub/lib/libc/src/Makefile.in 8 Jul 2009 21:52:59 -0000 @@ -182,16 +182,20 @@ endif export:: $(TARGETS) @@ -9755,7 +9810,7 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/prstreams/Makefile.in,v retrieving revision 1.21.2.1 diff -u -8 -p -w -r1.21.2.1 Makefile.in --- mozilla/nsprpub/lib/prstreams/Makefile.in 19 Oct 2006 00:39:28 -0000 1.21.2.1 -+++ mozilla/nsprpub/lib/prstreams/Makefile.in 8 Jul 2009 19:21:41 -0000 ++++ mozilla/nsprpub/lib/prstreams/Makefile.in 8 Jul 2009 21:53:00 -0000 @@ -64,17 +64,17 @@ ifeq ($(OS_ARCH),SunOS) endif @@ -9800,7 +9855,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/prio.h,v retrieving revision 3.40 diff -u -8 -p -w -r3.40 prio.h --- mozilla/nsprpub/pr/include/prio.h 25 Apr 2004 15:00:47 -0000 3.40 -+++ mozilla/nsprpub/pr/include/prio.h 8 Jul 2009 19:21:46 -0000 ++++ mozilla/nsprpub/pr/include/prio.h 8 Jul 2009 21:53:05 -0000 @@ -169,38 +169,41 @@ struct PRIPv6Addr { #define pr_s6_addr32 _S6_un._S6_u32 #define pr_s6_addr64 _S6_un._S6_u64 @@ -9855,7 +9910,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/prtypes.h,v retrieving revision 3.30.2.2 diff -u -8 -p -w -r3.30.2.2 prtypes.h --- mozilla/nsprpub/pr/include/prtypes.h 5 Apr 2006 21:51:21 -0000 3.30.2.2 -+++ mozilla/nsprpub/pr/include/prtypes.h 8 Jul 2009 19:21:48 -0000 ++++ mozilla/nsprpub/pr/include/prtypes.h 8 Jul 2009 21:53:07 -0000 @@ -93,29 +93,48 @@ #define PR_IMPLEMENT_DATA(__type) __declspec(dllexport) __type @@ -9911,7 +9966,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_beos.cfg,v retrieving revision 3.5.214.1 diff -u -8 -p -w -r3.5.214.1 _beos.cfg --- mozilla/nsprpub/pr/include/md/_beos.cfg 5 Apr 2006 22:00:45 -0000 3.5.214.1 -+++ mozilla/nsprpub/pr/include/md/_beos.cfg 8 Jul 2009 19:21:48 -0000 ++++ mozilla/nsprpub/pr/include/md/_beos.cfg 8 Jul 2009 21:53:07 -0000 @@ -15,16 +15,17 @@ * The Original Code is the Netscape Portable Runtime (NSPR). * @@ -9976,7 +10031,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_beos.h,v retrieving revision 3.23 diff -u -8 -p -w -r3.23 _beos.h --- mozilla/nsprpub/pr/include/md/_beos.h 17 Jan 2005 22:00:53 -0000 3.23 -+++ mozilla/nsprpub/pr/include/md/_beos.h 8 Jul 2009 19:21:48 -0000 ++++ mozilla/nsprpub/pr/include/md/_beos.h 8 Jul 2009 21:53:08 -0000 @@ -15,16 +15,17 @@ * The Original Code is the Netscape Portable Runtime (NSPR). * @@ -10620,7 +10675,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/include/private/primpl.h,v retrieving revision 3.84.2.2 diff -u -8 -p -w -r3.84.2.2 primpl.h --- mozilla/nsprpub/pr/include/private/primpl.h 25 Jul 2007 07:08:28 -0000 3.84.2.2 -+++ mozilla/nsprpub/pr/include/private/primpl.h 8 Jul 2009 19:21:53 -0000 ++++ mozilla/nsprpub/pr/include/private/primpl.h 8 Jul 2009 21:53:12 -0000 @@ -45,20 +45,16 @@ * This macro causes chaos if signal.h gets included before pthread.h. * To be safe, we include pthread.h first. @@ -10831,7 +10886,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/Makefile.in,v retrieving revision 1.40.2.2 diff -u -8 -p -w -r1.40.2.2 Makefile.in --- mozilla/nsprpub/pr/src/Makefile.in 19 Oct 2006 00:39:28 -0000 1.40.2.2 -+++ mozilla/nsprpub/pr/src/Makefile.in 8 Jul 2009 19:21:54 -0000 ++++ mozilla/nsprpub/pr/src/Makefile.in 8 Jul 2009 21:53:13 -0000 @@ -270,36 +270,33 @@ endif ifdef USE_PTHREADS @@ -10901,7 +10956,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/bsrcs.mk,v retrieving revision 3.6 diff -u -8 -p -w -r3.6 bsrcs.mk --- mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 25 Apr 2004 15:00:57 -0000 3.6 -+++ mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 8 Jul 2009 19:21:54 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/bsrcs.mk 8 Jul 2009 21:53:13 -0000 @@ -15,16 +15,17 @@ # The Original Code is the Netscape Portable Runtime (NSPR). # @@ -10938,7 +10993,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btcvar.c,v retrieving revision 3.9 diff -u -8 -p -w -r3.9 btcvar.c --- mozilla/nsprpub/pr/src/bthreads/btcvar.c 23 Feb 2005 17:43:13 -0000 3.9 -+++ mozilla/nsprpub/pr/src/bthreads/btcvar.c 8 Jul 2009 19:21:54 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/btcvar.c 8 Jul 2009 21:53:14 -0000 @@ -15,33 +15,32 @@ * The Original Code is the Netscape Portable Runtime (NSPR). * @@ -14576,7 +14631,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btlocks.c,v retrieving revision 3.7 diff -u -8 -p -w -r3.7 btlocks.c --- mozilla/nsprpub/pr/src/bthreads/btlocks.c 23 Feb 2005 17:43:13 -0000 3.7 -+++ mozilla/nsprpub/pr/src/bthreads/btlocks.c 8 Jul 2009 19:21:55 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/btlocks.c 8 Jul 2009 21:53:14 -0000 @@ -38,44 +38,38 @@ /* ** File: btlocks.c @@ -14671,7 +14726,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btmisc.c,v retrieving revision 3.5 diff -u -8 -p -w -r3.5 btmisc.c --- mozilla/nsprpub/pr/src/bthreads/btmisc.c 25 Apr 2004 15:00:57 -0000 3.5 -+++ mozilla/nsprpub/pr/src/bthreads/btmisc.c 8 Jul 2009 19:21:55 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/btmisc.c 8 Jul 2009 21:53:14 -0000 @@ -15,16 +15,17 @@ * The Original Code is the Netscape Portable Runtime (NSPR). * @@ -14775,7 +14830,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btsem.c,v retrieving revision 3.7 diff -u -8 -p -w -r3.7 btsem.c --- mozilla/nsprpub/pr/src/bthreads/btsem.c 23 Feb 2005 17:43:13 -0000 3.7 -+++ mozilla/nsprpub/pr/src/bthreads/btsem.c 8 Jul 2009 19:21:55 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/btsem.c 8 Jul 2009 21:53:14 -0000 @@ -33,16 +33,17 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -14800,7 +14855,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/bthreads/btthread.c,v retrieving revision 3.8 diff -u -8 -p -w -r3.8 btthread.c --- mozilla/nsprpub/pr/src/bthreads/btthread.c 25 Apr 2004 15:00:57 -0000 3.8 -+++ mozilla/nsprpub/pr/src/bthreads/btthread.c 8 Jul 2009 19:21:56 -0000 ++++ mozilla/nsprpub/pr/src/bthreads/btthread.c 8 Jul 2009 21:53:16 -0000 @@ -115,22 +115,19 @@ _PR_InitThreads (PRThreadType type, PRTh primordialThread->md.joinSem = B_ERROR; @@ -14967,7 +15022,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/Makefile.in,v retrieving revision 1.13 diff -u -8 -p -w -r1.13 Makefile.in --- mozilla/nsprpub/pr/src/io/Makefile.in 25 Apr 2004 15:00:58 -0000 1.13 -+++ mozilla/nsprpub/pr/src/io/Makefile.in 8 Jul 2009 19:21:56 -0000 ++++ mozilla/nsprpub/pr/src/io/Makefile.in 8 Jul 2009 21:53:16 -0000 @@ -64,23 +64,25 @@ CSRCS = \ prmmap.c \ prpolevt.c \ @@ -15000,7 +15055,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prmapopt.c,v retrieving revision 3.18 diff -u -8 -p -w -r3.18 prmapopt.c --- mozilla/nsprpub/pr/src/io/prmapopt.c 25 Apr 2004 15:00:58 -0000 3.18 -+++ mozilla/nsprpub/pr/src/io/prmapopt.c 8 Jul 2009 19:21:57 -0000 ++++ mozilla/nsprpub/pr/src/io/prmapopt.c 8 Jul 2009 21:53:17 -0000 @@ -69,17 +69,17 @@ /* NEXTSTEP is special: this must come before netinet/tcp.h. */ #include /* n_short, n_long, n_time */ @@ -15108,7 +15163,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prpolevt.c,v retrieving revision 3.15 diff -u -8 -p -w -r3.15 prpolevt.c --- mozilla/nsprpub/pr/src/io/prpolevt.c 25 Apr 2004 15:00:58 -0000 3.15 -+++ mozilla/nsprpub/pr/src/io/prpolevt.c 8 Jul 2009 19:21:58 -0000 ++++ mozilla/nsprpub/pr/src/io/prpolevt.c 8 Jul 2009 21:53:18 -0000 @@ -443,20 +443,20 @@ PR_IMPLEMENT(PRFileDesc *) PR_NewPollabl #else if (PR_NewTCPSocketPair(fd) == PR_FAILURE) { @@ -15140,7 +15195,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/io/prsocket.c,v retrieving revision 3.57.2.2 diff -u -8 -p -w -r3.57.2.2 prsocket.c --- mozilla/nsprpub/pr/src/io/prsocket.c 7 Nov 2007 22:24:04 -0000 3.57.2.2 -+++ mozilla/nsprpub/pr/src/io/prsocket.c 8 Jul 2009 19:22:01 -0000 ++++ mozilla/nsprpub/pr/src/io/prsocket.c 8 Jul 2009 21:53:23 -0000 @@ -59,17 +59,17 @@ PRBool IsValidNetAddr(const PRNetAddr *a static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len) @@ -15166,7 +15221,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/linking/prlink.c,v retrieving revision 3.81.2.5 diff -u -8 -p -w -r3.81.2.5 prlink.c --- mozilla/nsprpub/pr/src/linking/prlink.c 6 Oct 2006 23:36:22 -0000 3.81.2.5 -+++ mozilla/nsprpub/pr/src/linking/prlink.c 8 Jul 2009 19:22:05 -0000 ++++ mozilla/nsprpub/pr/src/linking/prlink.c 8 Jul 2009 21:53:27 -0000 @@ -194,18 +194,20 @@ struct PRLibrary { NSModule dlh; #else @@ -15370,7 +15425,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/beos/beos.c,v retrieving revision 3.5 diff -u -8 -p -w -r3.5 beos.c --- mozilla/nsprpub/pr/src/md/beos/beos.c 25 Apr 2004 15:00:59 -0000 3.5 -+++ mozilla/nsprpub/pr/src/md/beos/beos.c 8 Jul 2009 19:22:05 -0000 ++++ mozilla/nsprpub/pr/src/md/beos/beos.c 8 Jul 2009 21:53:28 -0000 @@ -32,233 +32,178 @@ * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under @@ -15720,7 +15775,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/beos/bproc.c,v retrieving revision 3.6 diff -u -8 -p -w -r3.6 bproc.c --- mozilla/nsprpub/pr/src/md/beos/bproc.c 25 Apr 2004 15:00:59 -0000 3.6 -+++ mozilla/nsprpub/pr/src/md/beos/bproc.c 8 Jul 2009 19:22:05 -0000 ++++ mozilla/nsprpub/pr/src/md/beos/bproc.c 8 Jul 2009 21:53:29 -0000 @@ -31,18 +31,20 @@ * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete @@ -15749,7 +15804,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/beos/bsrcs.mk,v retrieving revision 3.6 diff -u -8 -p -w -r3.6 bsrcs.mk --- mozilla/nsprpub/pr/src/md/beos/bsrcs.mk 25 Apr 2004 15:00:59 -0000 3.6 -+++ mozilla/nsprpub/pr/src/md/beos/bsrcs.mk 8 Jul 2009 19:22:06 -0000 ++++ mozilla/nsprpub/pr/src/md/beos/bsrcs.mk 8 Jul 2009 21:53:29 -0000 @@ -15,16 +15,17 @@ # The Original Code is the Netscape Portable Runtime (NSPR). # @@ -15793,7 +15848,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/memory/prseg.c,v retrieving revision 3.8 diff -u -8 -p -w -r3.8 prseg.c --- mozilla/nsprpub/pr/src/memory/prseg.c 25 Apr 2004 15:01:01 -0000 3.8 -+++ mozilla/nsprpub/pr/src/memory/prseg.c 8 Jul 2009 19:22:06 -0000 ++++ mozilla/nsprpub/pr/src/memory/prseg.c 8 Jul 2009 21:53:30 -0000 @@ -32,26 +32,26 @@ * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under @@ -15840,7 +15895,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v retrieving revision 1.19 diff -u -8 -p -w -r1.19 Makefile.in --- mozilla/nsprpub/pr/src/misc/Makefile.in 8 Nov 2004 02:52:56 -0000 1.19 -+++ mozilla/nsprpub/pr/src/misc/Makefile.in 8 Jul 2009 19:22:06 -0000 ++++ mozilla/nsprpub/pr/src/misc/Makefile.in 8 Jul 2009 21:53:30 -0000 @@ -66,20 +66,22 @@ CSRCS = \ prsystem.c \ prtime.c \ @@ -15870,7 +15925,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/prinit.c,v retrieving revision 3.43.2.1 diff -u -8 -p -w -r3.43.2.1 prinit.c --- mozilla/nsprpub/pr/src/misc/prinit.c 1 Dec 2006 00:34:11 -0000 3.43.2.1 -+++ mozilla/nsprpub/pr/src/misc/prinit.c 8 Jul 2009 19:22:08 -0000 ++++ mozilla/nsprpub/pr/src/misc/prinit.c 8 Jul 2009 21:53:33 -0000 @@ -195,18 +195,20 @@ static void _PR_InitStuff(void) _pr_shma_lm = PR_NewLogModule("shma"); @@ -15898,7 +15953,7 @@ RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/pripcsem.c,v retrieving revision 3.5 diff -u -8 -p -w -r3.5 pripcsem.c --- mozilla/nsprpub/pr/src/misc/pripcsem.c 25 Apr 2004 15:01:01 -0000 3.5 -+++ mozilla/nsprpub/pr/src/misc/pripcsem.c 8 Jul 2009 19:22:08 -0000 ++++ mozilla/nsprpub/pr/src/misc/pripcsem.c 8 Jul 2009 21:53:33 -0000 @@ -41,19 +41,19 @@ * Description: implements the named semaphores API in prsemipc.h * for classic NSPR. If _PR_HAVE_NAMED_SEMAPHORES is not defined, @@ -15938,7 +15993,7 @@ RCS file: /cvsroot/mozilla/profile/defaults/Attic/bookmarks.html,v retrieving revision 1.18.4.1 diff -u -8 -p -w -r1.18.4.1 bookmarks.html --- mozilla/profile/defaults/bookmarks.html 28 Nov 2007 16:42:30 -0000 1.18.4.1 -+++ mozilla/profile/defaults/bookmarks.html 8 Jul 2009 19:22:15 -0000 ++++ mozilla/profile/defaults/bookmarks.html 8 Jul 2009 21:53:43 -0000 @@ -1,41 +1,40 @@