diff --git a/mozilla/base/src/makefile.win b/mozilla/base/src/makefile.win index 924600079e7..68eb9379c2d 100644 --- a/mozilla/base/src/makefile.win +++ b/mozilla/base/src/makefile.win @@ -98,7 +98,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/mozilla/base/tests/makefile.win b/mozilla/base/tests/makefile.win index 9f50f77ad12..084aedbd064 100644 --- a/mozilla/base/tests/makefile.win +++ b/mozilla/base/tests/makefile.win @@ -45,7 +45,7 @@ LLIBS= \ $(DIST)\lib\netlib.lib \ !endif $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ !endif diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win index 4c160e70545..ce73726eb3d 100755 --- a/mozilla/caps/src/makefile.win +++ b/mozilla/caps/src/makefile.win @@ -107,7 +107,7 @@ LINCS= $(LINCS) \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\zip3250.lib \ diff --git a/mozilla/client.mk b/mozilla/client.mk index 3e95b728556..c55d5027d18 100644 --- a/mozilla/client.mk +++ b/mozilla/client.mk @@ -153,7 +153,7 @@ ifdef MOZ_WITH_NSPR NSPR_INSTALL_DIR := $(MOZ_WITH_NSPR) NEED_WITH_NSPR := 1 else -ifneq ("$(wildcard /usr/lib/libnspr21*)","") +ifneq ("$(wildcard /usr/lib/libnspr3*)","") NSPR_INSTALL_DIR := /usr else NSPR_INSTALL_DIR := $(OBJDIR)/nspr @@ -300,10 +300,10 @@ build: nspr $(OBJDIR)/Makefile # Build & install nspr. Classic build, no autoconf. # Linux/RPM available. -nspr: $(NSPR_INSTALL_DIR)/lib/libnspr21.so +nspr: $(NSPR_INSTALL_DIR)/lib/libnspr3.so @echo NSPR is installed in $(NSPR_INSTALL_DIR)/lib objdir=$(OBJDIR) -$(NSPR_INSTALL_DIR)/lib/libnspr21.so: +$(NSPR_INSTALL_DIR)/lib/libnspr3.so: @-$(MKDIR) -p $(NSPR_INSTALL_DIR) ($(MAKE) -C $(TOPSRCDIR)/nsprpub $(NSPR_GMAKE_OPTIONS)) diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak index 1417b78eca9..670fd89c472 100644 --- a/mozilla/config/config.mak +++ b/mozilla/config/config.mak @@ -311,11 +311,11 @@ MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat #// #//------------------------------------------------------------------------ !if "$(MOZ_BITS)" == "16" -LIBNSPR=$(DIST)\lib\nspr21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib +LIBNSPR=$(DIST)\lib\nspr3.lib +LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib !else -LIBNSPR=$(DIST)\lib\libnspr21.lib -LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib +LIBNSPR=$(DIST)\lib\nspr3.lib +LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib !endif NSPRDIR = nsprpub diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index c97a54af05d..26376c23e35 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -332,8 +332,8 @@ LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX) LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX) NSPRDIR = nsprpub -LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX) -PURELIBNSPR = $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX) +LIBNSPR = $(DIST)/lib/libplds3.$(LIB_SUFFIX) $(DIST)/lib/libnspr3.$(LIB_SUFFIX) +PURELIBNSPR = $(DIST)/lib/purelibplds3.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr3.$(LIB_SUFFIX) ifdef DBMALLOC LIBNSPR += $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX) diff --git a/mozilla/configure b/mozilla/configure index 9cdcc1dfeaa..8681eb2dfe2 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -7883,9 +7883,9 @@ else LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS" fi -echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21"""... $ac_c" 1>&6 -echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr21"" >&5 -LIBS="-lnspr21 $NSPR_LIBS $LIBS" +echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6 +echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr3"" >&5 +LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then _NSPR_NEEDS_THREAD_LIB=1 result="no" else @@ -7902,7 +7902,7 @@ else EOF if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" + NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -8003,11 +8003,11 @@ fi ;; esac -echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21 with thread lib"""... $ac_c" 1>&6 -echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5 - LIBS="-lnspr21 $NSPR_LIBS $LIBS" +echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6 +echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5 + LIBS="-lnspr3 $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then - MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no" + MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes" + NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no" + MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no" fi rm -fr conftest* fi @@ -8037,14 +8037,14 @@ echo "$ac_t"""$result"" 1>&6 fi -echo $ac_n "checking for PL_CreateOptState in -lplc21""... $ac_c" 1>&6 -echo "configure:8042: checking for PL_CreateOptState in -lplc21" >&5 -ac_lib_var=`echo plc21'_'PL_CreateOptState | sed 'y%./+-%__p_%'` +echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6 +echo "configure:8042: checking for PL_CreateOptState in -lplc3" >&5 +ac_lib_var=`echo plc3'_'PL_CreateOptState | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lplc21 $NSPR_LIBS $LIBS" +LIBS="-lplc3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&6 - NSPR_LIBS="-lplc21 $NSPR_LIBS" + NSPR_LIBS="-lplc3 $NSPR_LIBS" else echo "$ac_t""no" 1>&6 -MISSING_NSPR="$MISSING_NSPR -lplc21" +MISSING_NSPR="$MISSING_NSPR -lplc3" fi -echo $ac_n "checking for PL_GetEvent in -lplds21""... $ac_c" 1>&6 -echo "configure:8083: checking for PL_GetEvent in -lplds21" >&5 -ac_lib_var=`echo plds21'_'PL_GetEvent | sed 'y%./+-%__p_%'` +echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6 +echo "configure:8083: checking for PL_GetEvent in -lplds3" >&5 +ac_lib_var=`echo plds3'_'PL_GetEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lplds21 $NSPR_LIBS $LIBS" +LIBS="-lplds3 $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&6 - NSPR_LIBS="-lplds21 $NSPR_LIBS" + NSPR_LIBS="-lplds3 $NSPR_LIBS" else echo "$ac_t""no" 1>&6 -MISSING_NSPR="$MISSING_NSPR -lplds21" +MISSING_NSPR="$MISSING_NSPR -lplds3" fi diff --git a/mozilla/configure.in b/mozilla/configure.in index c8897110c03..551aec4bd63 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -1300,8 +1300,8 @@ else LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS" fi -AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21") -LIBS="-lnspr21 $NSPR_LIBS $LIBS" +AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3") +LIBS="-lnspr3 $NSPR_LIBS $LIBS" AC_TRY_RUN( #include #include @@ -1309,7 +1309,7 @@ AC_TRY_RUN( PRThread *dummy = PR_GetCurrentThread(); exit(0); } - , [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"], + , [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"], [_NSPR_NEEDS_THREAD_LIB=1 result="no"], [_NSPR_NEEDS_THREAD_LIB=1 result="no"] ) rm -f core @@ -1328,8 +1328,8 @@ case "$target" in NSPR_LIBS="-lpthread $NSPR_LIBS") ;; esac -AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib") - LIBS="-lnspr21 $NSPR_LIBS $LIBS" +AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3 with thread lib") + LIBS="-lnspr3 $NSPR_LIBS $LIBS" AC_TRY_RUN( #include #include @@ -1337,20 +1337,20 @@ AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib") PRThread *dummy = PR_GetCurrentThread(); exit(0); } - , [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"], - [MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"], - [MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"] ) + , [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"], + [MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"], + [MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"] ) rm -f core AC_MSG_RESULT("$result") fi -dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS", -dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS) +dnl AC_CHECK_LIB(nspr3, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS", +dnl [MISSING_NSPR="$MISSING_NSPR -lnspr3"], $NSPR_LIBS) -AC_CHECK_LIB(plc21, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS", - [MISSING_NSPR="$MISSING_NSPR -lplc21"], $NSPR_LIBS) -AC_CHECK_LIB(plds21, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS", - [MISSING_NSPR="$MISSING_NSPR -lplds21"], $NSPR_LIBS) +AC_CHECK_LIB(plc3, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS", + [MISSING_NSPR="$MISSING_NSPR -lplc3"], $NSPR_LIBS) +AC_CHECK_LIB(plds3, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS", + [MISSING_NSPR="$MISSING_NSPR -lplds3"], $NSPR_LIBS) CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index dbf3563c401..297130182e2 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -51,8 +51,8 @@ MISCDEP = \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplds21.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plds3.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) LCFLAGS = \ @@ -73,8 +73,8 @@ LLIBS= \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplds21.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plds3.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win index 14fb865ae4f..305a4f4e3d9 100644 --- a/mozilla/editor/base/makefile.win +++ b/mozilla/editor/base/makefile.win @@ -114,7 +114,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\raptorwidget_s.lib \ diff --git a/mozilla/extensions/wallet/module/makefile.win b/mozilla/extensions/wallet/module/makefile.win index 08acc6011b9..567a23afe85 100644 --- a/mozilla/extensions/wallet/module/makefile.win +++ b/mozilla/extensions/wallet/module/makefile.win @@ -74,7 +74,7 @@ LLIBS=$(LLIBS) $(LIBNSPR) \ $(WALLETLIBS) \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\secfreenav32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index fe5e3635ba7..c86f6bc3b27 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -76,7 +76,7 @@ LLIBS= \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\raptorgfx_s.lib \ !if defined(NGLAYOUT_DDRAW) diff --git a/mozilla/gfx/tests/btest/makefile.win b/mozilla/gfx/tests/btest/makefile.win index 22622b2303a..6aee7792764 100644 --- a/mozilla/gfx/tests/btest/makefile.win +++ b/mozilla/gfx/tests/btest/makefile.win @@ -29,7 +29,7 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ comdlg32.lib \ diff --git a/mozilla/gfx/tests/makefile.win b/mozilla/gfx/tests/makefile.win index 44a1b06a143..ec793cd7d11 100644 --- a/mozilla/gfx/tests/makefile.win +++ b/mozilla/gfx/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win index 80ad280d2ae..801647fab59 100644 --- a/mozilla/htmlparser/robot/makefile.win +++ b/mozilla/htmlparser/robot/makefile.win @@ -26,7 +26,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(NULL) diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index fb7e082c478..a7689781d56 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -135,7 +135,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ $(LIBNSPR) diff --git a/mozilla/intl/locale/src/windows/makefile.win b/mozilla/intl/locale/src/windows/makefile.win index 929ebec2165..6c0e7dfc6ed 100644 --- a/mozilla/intl/locale/src/windows/makefile.win +++ b/mozilla/intl/locale/src/windows/makefile.win @@ -55,7 +55,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nslocale_s.lib \ $(LIBNSPR) diff --git a/mozilla/intl/locale/tests/makefile.win b/mozilla/intl/locale/tests/makefile.win index 43c5673913f..05cd2c959d9 100644 --- a/mozilla/intl/locale/tests/makefile.win +++ b/mozilla/intl/locale/tests/makefile.win @@ -35,7 +35,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nslocale.lib LLFLAGS= /NODEFAULTLIB msvcirt.lib msvcrt.lib diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win index e01c24892ab..4a958ab6502 100644 --- a/mozilla/intl/lwbrk/src/makefile.win +++ b/mozilla/intl/lwbrk/src/makefile.win @@ -55,7 +55,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(LIBNSPR) diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win index 112a316f3e2..df2cb6fab7e 100644 --- a/mozilla/intl/lwbrk/tests/makefile.win +++ b/mozilla/intl/lwbrk/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/strres/src/makefile.win b/mozilla/intl/strres/src/makefile.win index 68dd8daae62..300d3dc7b65 100644 --- a/mozilla/intl/strres/src/makefile.win +++ b/mozilla/intl/strres/src/makefile.win @@ -53,7 +53,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/mozilla/intl/strres/tests/makefile.win b/mozilla/intl/strres/tests/makefile.win index 3faad83c553..6ffb3fa52f8 100644 --- a/mozilla/intl/strres/tests/makefile.win +++ b/mozilla/intl/strres/tests/makefile.win @@ -33,7 +33,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ !endif diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win index ef4d4e38272..ab9842eb253 100644 --- a/mozilla/intl/unicharutil/src/makefile.win +++ b/mozilla/intl/unicharutil/src/makefile.win @@ -53,7 +53,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win index 40441a52b78..7a6a65939f3 100644 --- a/mozilla/intl/unicharutil/tests/makefile.win +++ b/mozilla/intl/unicharutil/tests/makefile.win @@ -32,7 +32,7 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/jpeg/jpg1640.def b/mozilla/jpeg/jpg1640.def index 1acd52cbf08..95a2f168386 100644 --- a/mozilla/jpeg/jpg1640.def +++ b/mozilla/jpeg/jpg1640.def @@ -40,10 +40,10 @@ EXPORTS _jpeg_close_file = _jpeg_close_file @25 IMPORTS - _malloc = nspr21.2 - _realloc = nspr21.3 - _calloc = nspr21.4 - _free = nspr21.5 - _getenv = nspr21.9 - _printf = nspr21.11 - _sscanf = nspr21.33 + _malloc = nspr3.2 + _realloc = nspr3.3 + _calloc = nspr3.4 + _free = nspr3.5 + _getenv = nspr3.9 + _printf = nspr3.11 + _sscanf = nspr3.33 diff --git a/mozilla/js/src/Makefile.ref b/mozilla/js/src/Makefile.ref index d804fc5abfb..b2bf55ba0a6 100644 --- a/mozilla/js/src/Makefile.ref +++ b/mozilla/js/src/Makefile.ref @@ -34,9 +34,9 @@ ifdef JS_THREADSAFE DEFINES += -DJS_THREADSAFE INCLUDES += -I../../dist/$(OBJDIR)/include ifdef USE_MSVC -OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr21.lib +OTHER_LIBS += ../../dist/$(OBJDIR)/lib/nspr3.lib else -OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr21 +OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr3 endif endif diff --git a/mozilla/js/src/jsconfig.mk b/mozilla/js/src/jsconfig.mk index 8d4fbd8312c..1118635dbd0 100644 --- a/mozilla/js/src/jsconfig.mk +++ b/mozilla/js/src/jsconfig.mk @@ -62,9 +62,9 @@ ifdef JS_LIVECONNECT endif ifdef JS_THREADSAFE ifeq ($(OS_ARCH), HP-UX) - SHIP_LIBS += libnspr21.sl + SHIP_LIBS += libnspr3.sl else - SHIP_LIBS += libnspr21.so + SHIP_LIBS += libnspr3.so endif endif ifeq ($(OS_ARCH), WINNT) @@ -73,7 +73,7 @@ ifeq ($(OS_ARCH), WINNT) SHIP_LIBS += jsj.dll endif ifdef JS_THREADSAFE - SHIP_LIBS += libnspr21.dll + SHIP_LIBS += nspr3.dll endif endif SHIP_LIBS := $(addprefix $(SHIP_DIST)/lib/, $(SHIP_LIBS)) diff --git a/mozilla/js/src/liveconnect/Makefile.ref b/mozilla/js/src/liveconnect/Makefile.ref index dc8487df279..1d216cbf412 100644 --- a/mozilla/js/src/liveconnect/Makefile.ref +++ b/mozilla/js/src/liveconnect/Makefile.ref @@ -77,9 +77,9 @@ endif ifdef JS_THREADSAFE ifdef USE_MSVC -OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr21.lib +OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/nspr3.lib else -OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr21 +OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr3 endif endif diff --git a/mozilla/js/src/xpcom/xpcom.dsp b/mozilla/js/src/xpcom/xpcom.dsp index a83ee67a6e5..f26598bc9bd 100644 --- a/mozilla/js/src/xpcom/xpcom.dsp +++ b/mozilla/js/src/xpcom/xpcom.dsp @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib H:\trees\ns\dist\WINNT4.0_DBG.OBJ\lib\libnspr21.lib h:\trees\mozilla.org\mozilla\dist\WIN32_D.OBJ\lib\xpcom32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib H:\trees\ns\dist\WINNT4.0_DBG.OBJ\lib\nspr3.lib h:\trees\mozilla.org\mozilla\dist\WIN32_D.OBJ\lib\xpcom32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept !ENDIF diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win index e8334b0c378..b134dc4cf37 100644 --- a/mozilla/layout/base/tests/makefile.win +++ b/mozilla/layout/base/tests/makefile.win @@ -29,7 +29,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\jsdom.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index 301d0be73e2..8987b62e077 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -52,7 +52,7 @@ MISCDEP = \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\jsdom.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js3250.lib \ $(DIST)\lib\oji.lib \ $(DIST)\lib\jsj3250.lib \ @@ -85,7 +85,7 @@ LLIBS= \ $(DIST)\lib\raptorhtmlpars.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ !if defined(MOZ_DEBUG) && defined(GLOWCODE) && "$(MOZ_BITS)"=="32" $(GLOWDIR)\glowcode.lib \ diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index a8a5d3897f2..a80f9066657 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -60,7 +60,7 @@ LLIBS= \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/mailnews/base/build/makefile.win b/mozilla/mailnews/base/build/makefile.win index fd7416e8f6c..246aeb3a150 100644 --- a/mozilla/mailnews/base/build/makefile.win +++ b/mozilla/mailnews/base/build/makefile.win @@ -87,7 +87,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xplib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\appcores.lib \ diff --git a/mozilla/mailnews/base/tests/Makefile.in b/mozilla/mailnews/base/tests/Makefile.in index 57abb4dd94d..ff30cae9a11 100644 --- a/mozilla/mailnews/base/tests/Makefile.in +++ b/mozilla/mailnews/base/tests/Makefile.in @@ -33,9 +33,9 @@ LIBS = \ -L$(DIST)/bin \ -lxpcom \ -lreg \ - -lnspr21 \ - -lplc21 \ - -lplds21 \ + -lnspr3 \ + -lplc3 \ + -lplds3 \ $(NULL) diff --git a/mozilla/mailnews/compose/build/makefile.win b/mozilla/mailnews/compose/build/makefile.win index c784e0ffcf8..9ec17824fda 100644 --- a/mozilla/mailnews/compose/build/makefile.win +++ b/mozilla/mailnews/compose/build/makefile.win @@ -84,7 +84,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xplib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\msgcompose.lib \ diff --git a/mozilla/mailnews/compose/tests/smtp/makefile.win b/mozilla/mailnews/compose/tests/smtp/makefile.win index fa270143969..527d69bfbd6 100644 --- a/mozilla/mailnews/compose/tests/smtp/makefile.win +++ b/mozilla/mailnews/compose/tests/smtp/makefile.win @@ -35,7 +35,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xplib.lib \ $(NULL) diff --git a/mozilla/mailnews/local/build/makefile.win b/mozilla/mailnews/local/build/makefile.win index 1b6262a69b1..27f30772501 100644 --- a/mozilla/mailnews/local/build/makefile.win +++ b/mozilla/mailnews/local/build/makefile.win @@ -44,7 +44,7 @@ LLIBS=\ $(DIST)\lib\msgdb.lib \ $(DIST)\lib\msglocal.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\rdfutil_s.lib \ $(DIST)\lib\xplib.lib \ diff --git a/mozilla/mailnews/local/tests/mailbox/makefile.win b/mozilla/mailnews/local/tests/mailbox/makefile.win index 6ce5bd922f0..3ae156c47c4 100644 --- a/mozilla/mailnews/local/tests/mailbox/makefile.win +++ b/mozilla/mailnews/local/tests/mailbox/makefile.win @@ -44,7 +44,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\rdfutil_s.lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\msgdb.lib \ diff --git a/mozilla/mailnews/local/tests/mboxParser/makefile.win b/mozilla/mailnews/local/tests/mboxParser/makefile.win index 0218345d3b1..440f79b805a 100644 --- a/mozilla/mailnews/local/tests/mboxParser/makefile.win +++ b/mozilla/mailnews/local/tests/mboxParser/makefile.win @@ -42,7 +42,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\msglocal.lib \ $(DIST)\lib\msgcore.lib \ $(DIST)\lib\rdf.lib \ diff --git a/mozilla/mailnews/local/tests/pop3/makefile.win b/mozilla/mailnews/local/tests/pop3/makefile.win index d505bc04241..6dbaa539bde 100644 --- a/mozilla/mailnews/local/tests/pop3/makefile.win +++ b/mozilla/mailnews/local/tests/pop3/makefile.win @@ -42,7 +42,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\msglocal.lib \ $(DIST)\lib\msgcore.lib \ diff --git a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win index d4ab56c20ee..1ca5473c5b5 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win @@ -88,7 +88,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\xpcom32.lib \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win index 5db21cf2fc3..447c65a8bfb 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win @@ -96,7 +96,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\xppref32.lib \ diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win index 6e2c9aea5c6..b5aae58371d 100644 --- a/mozilla/mailnews/mime/src/makefile.win +++ b/mozilla/mailnews/mime/src/makefile.win @@ -157,7 +157,7 @@ MSGLIBS= \ LLIBS= \ $(LLIBS) \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\xppref32.lib \ diff --git a/mozilla/mailnews/news/tests/nntp/makefile.win b/mozilla/mailnews/news/tests/nntp/makefile.win index 46b8aaf5499..902a7c339ab 100644 --- a/mozilla/mailnews/news/tests/nntp/makefile.win +++ b/mozilla/mailnews/news/tests/nntp/makefile.win @@ -35,7 +35,7 @@ MYLIBS= \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorwidget.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nntp.lib \ $(DIST)\lib\nntpTest.lib \ $(DIST)\lib\msgcore.lib \ diff --git a/mozilla/mailnews/ui/messenger/src/makefile.win b/mozilla/mailnews/ui/messenger/src/makefile.win index 3f3f5fbf64d..40f82f606cd 100644 --- a/mozilla/mailnews/ui/messenger/src/makefile.win +++ b/mozilla/mailnews/ui/messenger/src/makefile.win @@ -63,7 +63,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib\ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\nntp.lib \ $(DIST)\lib\nntpTest.lib \ $(DIST)\lib\msgCore.lib \ diff --git a/mozilla/modules/libimg/src/makefile.win b/mozilla/modules/libimg/src/makefile.win index 2b7fd43c46d..6ae8eb47e2a 100644 --- a/mozilla/modules/libimg/src/makefile.win +++ b/mozilla/modules/libimg/src/makefile.win @@ -50,7 +50,7 @@ LCFLAGS = $(LCFLAGS) /TP LLIBS=$(DIST)\lib\png.lib \ $(LIBNSPR) \ $(LIBJPEG) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\util.lib \ $(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index 3fc260dd558..cac9bbcd5fc 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -76,7 +76,7 @@ HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib # DEFFILE = $(DLLNAME).def LLIBS = \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/mozilla/modules/libpref/src/xppref16.def b/mozilla/modules/libpref/src/xppref16.def index e0fc7ec5079..659b63195c3 100644 --- a/mozilla/modules/libpref/src/xppref16.def +++ b/mozilla/modules/libpref/src/xppref16.def @@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE HEAPSIZE 8192 IMPORTS - _sscanf = nspr21.33 + _sscanf = nspr3.33 EXPORTS _PREF_Init = _PREF_Init diff --git a/mozilla/modules/libpref/src/xpref16.def b/mozilla/modules/libpref/src/xpref16.def index e0fc7ec5079..659b63195c3 100644 --- a/mozilla/modules/libpref/src/xpref16.def +++ b/mozilla/modules/libpref/src/xpref16.def @@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE HEAPSIZE 8192 IMPORTS - _sscanf = nspr21.33 + _sscanf = nspr3.33 EXPORTS _PREF_Init = _PREF_Init diff --git a/mozilla/modules/libreg/src/makefile.win b/mozilla/modules/libreg/src/makefile.win index b67892e12fe..56269c90e1b 100644 --- a/mozilla/modules/libreg/src/makefile.win +++ b/mozilla/modules/libreg/src/makefile.win @@ -72,7 +72,7 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ LCFLAGS = $(LCFLAGS) -LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\libplc21.lib +LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib diff --git a/mozilla/modules/libreg/standalone/makefile.win b/mozilla/modules/libreg/standalone/makefile.win index e85c5593a1e..9c4f2899c6d 100644 --- a/mozilla/modules/libreg/standalone/makefile.win +++ b/mozilla/modules/libreg/standalone/makefile.win @@ -82,13 +82,12 @@ LINCS= $(LINCS) -I$(PUBLIC)/libreg \ #//------------------------------------------------------------------------ include <$(DEPTH)/config/rules.mak> -reg.c:: +reg.c: $(RM) $(DEPTH)\modules\libreg\standalone\reg.h $(RM) $(DEPTH)\modules\libreg\standalone\reg.c $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c - copy $(DEPTH)\modules\libreg\src\reg.h $(DEPTH)\modules\libreg\standalone\reg.h copy $(DEPTH)\modules\libreg\src\reg.c $(DEPTH)\modules\libreg\standalone\reg.c copy $(DEPTH)\modules\libreg\src\vr_stubs.h $(DEPTH)\modules\libreg\standalone\vr_stubs.h @@ -112,4 +111,4 @@ clobber:: $(RM) $(DEPTH)\modules\libreg\standalone\reg.c $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h $(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c - $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c \ No newline at end of file + $(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index 1b5fa0649fd..6b0bdf4ded7 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -103,7 +103,7 @@ EXPORTS = jvmmgr.h \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ $(DIST)\lib\js3250.lib \ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index baadc115123..9b7927d9761 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -43,7 +43,7 @@ CPPSRCS = \ nsPluginInstancePeer.cpp \ $(NULL) -REQUIRES = raptor plugin java xpcom netlib libplc21 oji +REQUIRES = raptor plugin java xpcom netlib libplc3 oji CFLAGS += -D_IMPL_NS_PLUGIN diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win index 9411e87a1db..a11176205dc 100644 --- a/mozilla/modules/plugin/base/src/makefile.win +++ b/mozilla/modules/plugin/base/src/makefile.win @@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib OURLIBS = \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\$(CACHELIBNAME) \ $(DIST)\lib\xppref32.lib \ diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index baadc115123..9b7927d9761 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/modules/plugin/nglsrc/Makefile.in @@ -43,7 +43,7 @@ CPPSRCS = \ nsPluginInstancePeer.cpp \ $(NULL) -REQUIRES = raptor plugin java xpcom netlib libplc21 oji +REQUIRES = raptor plugin java xpcom netlib libplc3 oji CFLAGS += -D_IMPL_NS_PLUGIN diff --git a/mozilla/modules/plugin/nglsrc/makefile.win b/mozilla/modules/plugin/nglsrc/makefile.win index 9411e87a1db..a11176205dc 100644 --- a/mozilla/modules/plugin/nglsrc/makefile.win +++ b/mozilla/modules/plugin/nglsrc/makefile.win @@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib OURLIBS = \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\$(CACHELIBNAME) \ $(DIST)\lib\xppref32.lib \ diff --git a/mozilla/modules/zlib/src/zip16.def b/mozilla/modules/zlib/src/zip16.def index 1c228a4558a..664eeab0953 100644 --- a/mozilla/modules/zlib/src/zip16.def +++ b/mozilla/modules/zlib/src/zip16.def @@ -14,11 +14,11 @@ HEAPSIZE 8192 EXPORTS IMPORTS - _malloc = nspr21.2 - _realloc = nspr21.3 - _calloc = nspr21.4 - _free = nspr21.5 - _getenv = nspr21.9 - _printf = nspr21.11 - _sscanf = nspr21.33 + _malloc = nspr3.2 + _realloc = nspr3.3 + _calloc = nspr3.4 + _free = nspr3.5 + _getenv = nspr3.9 + _printf = nspr3.11 + _sscanf = nspr3.33 diff --git a/mozilla/network/cache/nu/src/Makefile.in b/mozilla/network/cache/nu/src/Makefile.in index dc936113a1e..8d40e618df5 100644 --- a/mozilla/network/cache/nu/src/Makefile.in +++ b/mozilla/network/cache/nu/src/Makefile.in @@ -29,7 +29,7 @@ LIBRARY_NAME=cache MISCDEP = \ $(NSPR_LIBS) \ $(DIST)/lib/dbm32.lib \ - $(DIST)/lib/libplc21.lib \ + $(DIST)/lib/plc3.lib \ $(DIST)/lib/xpcom32.lib \ $(DIST)/lib/libpref.lib \ $(NULL) @@ -56,7 +56,7 @@ REQUIRES = dbm pref js xpcom LLIBS = \ $(DIST)/lib/dbm32.lib \ - $(DIST)/lib/libplc21.lib \ + $(DIST)/lib/plc3.lib \ $(DIST)/lib/xpcom32.lib \ $(DIST)/lib/libpref.lib \ $(NSPR_LIBS) \ diff --git a/mozilla/network/cache/nu/src/makefile.win b/mozilla/network/cache/nu/src/makefile.win index 5a658acdb03..822d9147bf1 100644 --- a/mozilla/network/cache/nu/src/makefile.win +++ b/mozilla/network/cache/nu/src/makefile.win @@ -26,11 +26,11 @@ DLLNAME = cache LIBRARY_NAME=cache # -# Remember to change libplc21 to $whatever it is... +# Remember to change libplc3 to $whatever it is... # LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\dbm32.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\libpref.lib \ diff --git a/mozilla/network/cache/nu/tests/cb/cb.mak b/mozilla/network/cache/nu/tests/cb/cb.mak index fae23dccc57..97010e76a31 100644 --- a/mozilla/network/cache/nu/tests/cb/cb.mak +++ b/mozilla/network/cache/nu/tests/cb/cb.mak @@ -180,10 +180,10 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows /debug /machine:I386 +# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows /debug /machine:I386 # SUBTRACT LINK32 /nodefaultlib -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib\ +LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib\ + ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib\ ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib\ ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows\ /incremental:yes /pdb:"$(OUTDIR)/cb.pdb" /debug /machine:I386\ diff --git a/mozilla/network/cache/nu/tests/fftest/fftest.mak b/mozilla/network/cache/nu/tests/fftest/fftest.mak index 3dbc197578e..d901894fbe9 100644 --- a/mozilla/network/cache/nu/tests/fftest/fftest.mak +++ b/mozilla/network/cache/nu/tests/fftest/fftest.mak @@ -79,9 +79,9 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /machine:I386 -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\ +# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib /nologo /subsystem:console /machine:I386 +LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib\ + ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib /nologo /subsystem:console\ /incremental:no /pdb:"$(OUTDIR)/fftest.pdb" /machine:I386\ /out:"$(OUTDIR)/fftest.exe" LINK32_OBJS= \ @@ -146,9 +146,9 @@ BSC32_SBRS= \ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 -# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /debug /machine:I386 -LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\ - ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\ +# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib /nologo /subsystem:console /debug /machine:I386 +LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\nspr3.lib\ + ..\..\..\..\..\dist\win32_d.obj\lib\plc3.lib /nologo /subsystem:console\ /incremental:yes /pdb:"$(OUTDIR)/fftest.pdb" /debug /machine:I386\ /out:"$(OUTDIR)/fftest.exe" LINK32_OBJS= \ diff --git a/mozilla/network/module/makefile.win b/mozilla/network/module/makefile.win index 4a90d4ed678..05d4ee63e87 100644 --- a/mozilla/network/module/makefile.win +++ b/mozilla/network/module/makefile.win @@ -116,7 +116,7 @@ NETLIBS=\ LLIBS=$(LLIBS) $(LIBNSPR) \ $(DIST)\lib\secfreenav32.lib \ $(DIST)\lib\libpwcac.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom32.lib \ diff --git a/mozilla/network/module/tests/makefile.win b/mozilla/network/module/tests/makefile.win index 3437c057fce..35adfc17c65 100644 --- a/mozilla/network/module/tests/makefile.win +++ b/mozilla/network/module/tests/makefile.win @@ -74,7 +74,7 @@ LLIBS=$(LLIBS) \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib LINCS=$(LINCS) -I. \ -I$(PUBLIC)\raptor \ diff --git a/mozilla/network/module/tests/transportTest.cpp b/mozilla/network/module/tests/transportTest.cpp index 23eecf68d16..5bea0a95f48 100644 --- a/mozilla/network/module/tests/transportTest.cpp +++ b/mozilla/network/module/tests/transportTest.cpp @@ -311,7 +311,6 @@ int main() nsresult result; int i; - PL_InitializeEventsLib(""); nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE); nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE); diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win index 80ad280d2ae..801647fab59 100644 --- a/mozilla/parser/htmlparser/robot/makefile.win +++ b/mozilla/parser/htmlparser/robot/makefile.win @@ -26,7 +26,7 @@ LLIBS= \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(NULL) diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index fb7e082c478..a7689781d56 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -135,7 +135,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\expat.lib \ $(LIBNSPR) diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win index 7af581b0aa2..d4373233228 100644 --- a/mozilla/rdf/build/makefile.win +++ b/mozilla/rdf/build/makefile.win @@ -43,7 +43,7 @@ LLIBS=\ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\raptorhtml.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\js3250.lib \ diff --git a/mozilla/rdf/tests/localfile/makefile.win b/mozilla/rdf/tests/localfile/makefile.win index acd15dc296e..aa574b871fd 100644 --- a/mozilla/rdf/tests/localfile/makefile.win +++ b/mozilla/rdf/tests/localfile/makefile.win @@ -42,7 +42,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/rdf/tests/rdfsink/makefile.win b/mozilla/rdf/tests/rdfsink/makefile.win index 04783751e10..280375727f4 100644 --- a/mozilla/rdf/tests/rdfsink/makefile.win +++ b/mozilla/rdf/tests/rdfsink/makefile.win @@ -42,7 +42,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\netlib.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/silentdl/makefile.win b/mozilla/silentdl/makefile.win index e024c77cc30..3a2594565da 100644 --- a/mozilla/silentdl/makefile.win +++ b/mozilla/silentdl/makefile.win @@ -53,7 +53,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) OBJS = \ diff --git a/mozilla/webshell/embed/ngprefs/win/makefile.win b/mozilla/webshell/embed/ngprefs/win/makefile.win index a086c3fa750..b608bbc9a2c 100644 --- a/mozilla/webshell/embed/ngprefs/win/makefile.win +++ b/mozilla/webshell/embed/ngprefs/win/makefile.win @@ -31,7 +31,7 @@ LINCS = \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xppref32.lib \ OLE32.lib \ UUID.lib \ diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win index ebbf9b1c947..ee3e983a867 100644 --- a/mozilla/webshell/src/makefile.win +++ b/mozilla/webshell/src/makefile.win @@ -74,7 +74,7 @@ LLIBS= \ $(DIST)\lib\raptorhtml.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\jsdom.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ diff --git a/mozilla/webshell/tests/imgtest/makefile.win b/mozilla/webshell/tests/imgtest/makefile.win index 464c618c5fc..f6d61a79a97 100644 --- a/mozilla/webshell/tests/imgtest/makefile.win +++ b/mozilla/webshell/tests/imgtest/makefile.win @@ -35,7 +35,7 @@ LLIBS= \ $(DIST)\lib\raptorweb.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\img32$(VERSION_NUMBER).lib \ $(DIST)\lib\util.lib \ comdlg32.lib diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win index 0484a3cb531..196ffd56322 100644 --- a/mozilla/webshell/tests/viewer/makefile.win +++ b/mozilla/webshell/tests/viewer/makefile.win @@ -32,7 +32,7 @@ MISCDEP= \ $(DIST)\lib\raptorweb.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib OBJS = \ @@ -91,7 +91,7 @@ MYLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\jsdom.lib \ comdlg32.lib \ diff --git a/mozilla/xpcom/libxpt/xptinfo/src/makefile.win b/mozilla/xpcom/libxpt/xptinfo/src/makefile.win index 9ad7bab5b24..353c406b338 100644 --- a/mozilla/xpcom/libxpt/xptinfo/src/makefile.win +++ b/mozilla/xpcom/libxpt/xptinfo/src/makefile.win @@ -37,7 +37,7 @@ LLIBS = \ $(DIST)\lib\libxpt$(MOZ_BITS).lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) CSRCS = \ diff --git a/mozilla/xpcom/reflect/xptinfo/src/makefile.win b/mozilla/xpcom/reflect/xptinfo/src/makefile.win index 9ad7bab5b24..353c406b338 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/src/makefile.win @@ -37,7 +37,7 @@ LLIBS = \ $(DIST)\lib\libxpt$(MOZ_BITS).lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) CSRCS = \ diff --git a/mozilla/xpcom/src/makefile.win b/mozilla/xpcom/src/makefile.win index 785591d23d5..44acae37b8a 100644 --- a/mozilla/xpcom/src/makefile.win +++ b/mozilla/xpcom/src/makefile.win @@ -28,7 +28,7 @@ LINCS = \ LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\libreg32.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ diff --git a/mozilla/xpcom/src/nsEventQueueService.cpp b/mozilla/xpcom/src/nsEventQueueService.cpp index ea37c6fe0e8..069b1295da7 100644 --- a/mozilla/xpcom/src/nsEventQueueService.cpp +++ b/mozilla/xpcom/src/nsEventQueueService.cpp @@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry() { NS_INIT_REFCNT(); -#ifdef XP_PC - // XXX: For now only use the main eventQ... When the event queue is - // created via PL_CreateNativeEventQueue(...) this can go away... - PL_InitializeEventsLib(""); - mEventQueue = PL_GetMainEventQueue(); -#else - mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread()); -#endif + mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread()); } EventQueueEntry::~EventQueueEntry() diff --git a/mozilla/xpcom/tests/dynamic/makefile.win b/mozilla/xpcom/tests/dynamic/makefile.win index b750d5b39be..8003ab784a9 100644 --- a/mozilla/xpcom/tests/dynamic/makefile.win +++ b/mozilla/xpcom/tests/dynamic/makefile.win @@ -28,7 +28,7 @@ LINCS = -I.. -I../../public LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index 2928a1eb3cf..4e17318517b 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -38,7 +38,7 @@ LINCS=-I..\public -Iservices LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/mozilla/xpcom/tests/services/makefile.win b/mozilla/xpcom/tests/services/makefile.win index 48c337bb539..cfc5442e77e 100644 --- a/mozilla/xpcom/tests/services/makefile.win +++ b/mozilla/xpcom/tests/services/makefile.win @@ -28,7 +28,7 @@ LINCS = -I.. -I../../public LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/mozilla/xpcom/tests/windows/makefile.win b/mozilla/xpcom/tests/windows/makefile.win index ae11e011584..a1a4416b4c6 100644 --- a/mozilla/xpcom/tests/windows/makefile.win +++ b/mozilla/xpcom/tests/windows/makefile.win @@ -30,7 +30,7 @@ LLIBS= \ uuid.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib !endif diff --git a/mozilla/xpcom/threads/nsEventQueueService.cpp b/mozilla/xpcom/threads/nsEventQueueService.cpp index ea37c6fe0e8..069b1295da7 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.cpp +++ b/mozilla/xpcom/threads/nsEventQueueService.cpp @@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry() { NS_INIT_REFCNT(); -#ifdef XP_PC - // XXX: For now only use the main eventQ... When the event queue is - // created via PL_CreateNativeEventQueue(...) this can go away... - PL_InitializeEventsLib(""); - mEventQueue = PL_GetMainEventQueue(); -#else - mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread()); -#endif + mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread()); } EventQueueEntry::~EventQueueEntry() diff --git a/mozilla/xpcom/tools/registry/makefile.win b/mozilla/xpcom/tools/registry/makefile.win index 80120b188d5..b18e6a805bb 100644 --- a/mozilla/xpcom/tools/registry/makefile.win +++ b/mozilla/xpcom/tools/registry/makefile.win @@ -30,7 +30,7 @@ PROGRAMS = $(PROG1) LLIBS = \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\xpcom$(MOZ_BITS).lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ diff --git a/mozilla/xpfe/AppCores/src/makefile.win b/mozilla/xpfe/AppCores/src/makefile.win index 06cfcb49457..0e87027bb97 100644 --- a/mozilla/xpfe/AppCores/src/makefile.win +++ b/mozilla/xpfe/AppCores/src/makefile.win @@ -57,7 +57,7 @@ LLIBS = \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(NULL) OBJS = \ diff --git a/mozilla/xpfe/apprunner/src/makefile.win b/mozilla/xpfe/apprunner/src/makefile.win index 7fd2c0d3c2d..64e4dab9bb6 100644 --- a/mozilla/xpfe/apprunner/src/makefile.win +++ b/mozilla/xpfe/apprunner/src/makefile.win @@ -46,7 +46,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win index ccc7a31c678..a66db953f02 100644 --- a/mozilla/xpfe/appshell/src/makefile.win +++ b/mozilla/xpfe/appshell/src/makefile.win @@ -62,7 +62,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win index b67920e8d4e..fa957abdfb9 100644 --- a/mozilla/xpfe/bootstrap/makefile.win +++ b/mozilla/xpfe/bootstrap/makefile.win @@ -68,7 +68,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorgfxwin.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/browser/src/makefile.win b/mozilla/xpfe/browser/src/makefile.win index 3f34960e908..9433356204f 100644 --- a/mozilla/xpfe/browser/src/makefile.win +++ b/mozilla/xpfe/browser/src/makefile.win @@ -54,7 +54,7 @@ LLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorgfxwin.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/main/makefile.win b/mozilla/xpfe/main/makefile.win index 384dd810ba7..8c4dca1837a 100644 --- a/mozilla/xpfe/main/makefile.win +++ b/mozilla/xpfe/main/makefile.win @@ -44,7 +44,7 @@ LCFLAGS = \ LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/tools/makefile.win b/mozilla/xpfe/tools/makefile.win index 1fdc168d1ba..5c0212c688c 100644 --- a/mozilla/xpfe/tools/makefile.win +++ b/mozilla/xpfe/tools/makefile.win @@ -45,7 +45,7 @@ LCFLAGS = \ # These are the libraries we need to link with to create the exe LLIBS= \ $(DIST)\lib\xpcom32.lib \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/xpviewer/src/makefile.win b/mozilla/xpfe/xpviewer/src/makefile.win index aff5f897362..5521dda90e4 100644 --- a/mozilla/xpfe/xpviewer/src/makefile.win +++ b/mozilla/xpfe/xpviewer/src/makefile.win @@ -27,7 +27,7 @@ MISCDEP= \ $(DIST)\lib\raptorweb.lib \ $(DIST)\lib\xpcom32.lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib + $(DIST)\lib\plc3.lib OBJS = \ @@ -65,7 +65,7 @@ MYLIBS= \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\js32$(VERSION_NUMBER).lib \ $(LIBNSPR) \ - $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\plc3.lib \ $(DIST)\lib\netlib.lib \ $(DIST)\lib\jsdom.lib \ comdlg32.lib \