Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Landing nspr library name change, and plevent function call change.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24276 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
leaf%mozilla.org
1999-03-17 21:32:03 +00:00
parent cdec214c4c
commit 8fadf11677
92 changed files with 165 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/base/src/makefile.win
View File

@@ -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

2
mozilla/base/tests/makefile.win
View File

@@ -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

2
mozilla/caps/src/makefile.win
View File

@@ -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 \

6
mozilla/client.mk
View File

@@ -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))

8
mozilla/config/config.mak
View File

@@ -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

4
mozilla/config/config.mk
View File

@@ -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)

44
mozilla/configure vendored
View File

@@ -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 <<EOF
#line 8014 "configure"
@@ -8022,12 +8022,12 @@ else
EOF
if { (eval echo configure:8024: \"$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
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 <<EOF
#line 8050 "configure"
#include "confdefs.h"
@@ -8072,20 +8072,20 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&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 <<EOF
#line 8091 "configure"
#include "confdefs.h"
@@ -8113,10 +8113,10 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&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

28
mozilla/configure.in
View File

@@ -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 <stdio.h>
#include <nspr.h>
@@ -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 <stdio.h>
#include <nspr.h>
@@ -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

8
mozilla/dom/src/build/makefile.win
View File

@@ -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>

2
mozilla/editor/base/makefile.win
View File

@@ -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 \

2
mozilla/extensions/wallet/module/makefile.win
View File

@@ -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 \

2
mozilla/gfx/src/windows/makefile.win
View File

@@ -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)

2
mozilla/gfx/tests/btest/makefile.win
View File

@@ -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 \

2
mozilla/gfx/tests/makefile.win
View File

@@ -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>

2
mozilla/htmlparser/robot/makefile.win
View File

@@ -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)

2
mozilla/htmlparser/src/makefile.win
View File

@@ -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)

2
mozilla/intl/locale/src/windows/makefile.win
View File

@@ -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)

2
mozilla/intl/locale/tests/makefile.win
View File

@@ -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

2
mozilla/intl/lwbrk/src/makefile.win
View File

@@ -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)

2
mozilla/intl/lwbrk/tests/makefile.win
View File

@@ -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>

2
mozilla/intl/strres/src/makefile.win
View File

@@ -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

2
mozilla/intl/strres/tests/makefile.win
View File

@@ -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

2
mozilla/intl/unicharutil/src/makefile.win
View File

@@ -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>

2
mozilla/intl/unicharutil/tests/makefile.win
View File

@@ -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>

14
mozilla/jpeg/jpg1640.def
View File

@@ -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

4
mozilla/js/src/Makefile.ref
View File

@@ -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

6
mozilla/js/src/jsconfig.mk
View File

@@ -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))

4
mozilla/js/src/liveconnect/Makefile.ref
View File

@@ -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

2
mozilla/js/src/xpcom/xpcom.dsp
View File

@@ -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

2
mozilla/layout/base/tests/makefile.win
View File

@@ -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>

4
mozilla/layout/build/makefile.win
View File

@@ -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 \

2
mozilla/layout/html/tests/makefile.win
View File

@@ -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>

2
mozilla/mailnews/base/build/makefile.win
View File

@@ -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 \

6
mozilla/mailnews/base/tests/Makefile.in
View File

@@ -33,9 +33,9 @@ LIBS = \
-L$(DIST)/bin \
-lxpcom \
-lreg \
-lnspr21 \
-lplc21 \
-lplds21 \
-lnspr3 \
-lplc3 \
-lplds3 \
$(NULL)

2
mozilla/mailnews/compose/build/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/compose/tests/smtp/makefile.win
View File

@@ -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)

2
mozilla/mailnews/local/build/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/local/tests/mailbox/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/local/tests/mboxParser/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/local/tests/pop3/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/mime/cthandlers/calendar/makefile.win
View File

@@ -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)

2
mozilla/mailnews/mime/cthandlers/vcard/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/mime/src/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/news/tests/nntp/makefile.win
View File

@@ -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 \

2
mozilla/mailnews/ui/messenger/src/makefile.win
View File

@@ -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 \

2
mozilla/modules/libimg/src/makefile.win
View File

@@ -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 \

2
mozilla/modules/libpref/src/makefile.win
View File

@@ -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 \

2
mozilla/modules/libpref/src/xppref16.def
View File

@@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE
HEAPSIZE 8192
IMPORTS
_sscanf = nspr21.33
_sscanf = nspr3.33
EXPORTS
_PREF_Init = _PREF_Init

2
mozilla/modules/libpref/src/xpref16.def
View File

@@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE
HEAPSIZE 8192
IMPORTS
_sscanf = nspr21.33
_sscanf = nspr3.33
EXPORTS
_PREF_Init = _PREF_Init

2
mozilla/modules/libreg/src/makefile.win
View File

@@ -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

5
mozilla/modules/libreg/standalone/makefile.win
View File

@@ -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
$(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c

2
mozilla/modules/oji/src/makefile.win
View File

@@ -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 \

2
mozilla/modules/plugin/base/src/Makefile.in
View File

@@ -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

2
mozilla/modules/plugin/base/src/makefile.win
View File

@@ -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 \

2
mozilla/modules/plugin/nglsrc/Makefile.in
View File

@@ -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

2
mozilla/modules/plugin/nglsrc/makefile.win
View File

@@ -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 \

14
mozilla/modules/zlib/src/zip16.def
View File

@@ -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

4
mozilla/network/cache/nu/src/Makefile.in vendored
View File

@@ -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) \

4
mozilla/network/cache/nu/src/makefile.win vendored
View File

@@ -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 \

6
mozilla/network/cache/nu/tests/cb/cb.mak vendored
View File

@@ -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\

12
mozilla/network/cache/nu/tests/fftest/fftest.mak vendored
View File

@@ -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= \

2
mozilla/network/module/makefile.win
View File

@@ -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 \

2
mozilla/network/module/tests/makefile.win
View File

@@ -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 \

1
mozilla/network/module/tests/transportTest.cpp
View File

@@ -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);

2
mozilla/parser/htmlparser/robot/makefile.win
View File

@@ -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)

2
mozilla/parser/htmlparser/src/makefile.win
View File

@@ -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)

2
mozilla/rdf/build/makefile.win
View File

@@ -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 \

2
mozilla/rdf/tests/localfile/makefile.win
View File

@@ -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>

2
mozilla/rdf/tests/rdfsink/makefile.win
View File

@@ -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>

2
mozilla/silentdl/makefile.win
View File

@@ -53,7 +53,7 @@ LLIBS = \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
OBJS = \

2
mozilla/webshell/embed/ngprefs/win/makefile.win
View File

@@ -31,7 +31,7 @@ LINCS = \
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xppref32.lib \
OLE32.lib \
UUID.lib \

2
mozilla/webshell/src/makefile.win
View File

@@ -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) \

2
mozilla/webshell/tests/imgtest/makefile.win
View File

@@ -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

4
mozilla/webshell/tests/viewer/makefile.win
View File

@@ -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 \

2
mozilla/xpcom/libxpt/xptinfo/src/makefile.win
View File

@@ -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 = \

2
mozilla/xpcom/reflect/xptinfo/src/makefile.win
View File

@@ -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 = \

2
mozilla/xpcom/src/makefile.win
View File

@@ -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 \

9
mozilla/xpcom/src/nsEventQueueService.cpp
View File

@@ -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()

2
mozilla/xpcom/tests/dynamic/makefile.win
View File

@@ -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

2
mozilla/xpcom/tests/makefile.win
View File

@@ -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

2
mozilla/xpcom/tests/services/makefile.win
View File

@@ -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

2
mozilla/xpcom/tests/windows/makefile.win
View File

@@ -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

9
mozilla/xpcom/threads/nsEventQueueService.cpp
View File

@@ -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()

2
mozilla/xpcom/tools/registry/makefile.win
View File

@@ -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 \

2
mozilla/xpfe/AppCores/src/makefile.win
View File

@@ -57,7 +57,7 @@ LLIBS = \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
OBJS = \

2
mozilla/xpfe/apprunner/src/makefile.win
View File

@@ -46,7 +46,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(NULL)

2
mozilla/xpfe/appshell/src/makefile.win
View File

@@ -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)

2
mozilla/xpfe/bootstrap/makefile.win
View File

@@ -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)

2
mozilla/xpfe/browser/src/makefile.win
View File

@@ -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)

2
mozilla/xpfe/main/makefile.win
View File

@@ -44,7 +44,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(NULL)

2
mozilla/xpfe/tools/makefile.win
View File

@@ -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)

4
mozilla/xpfe/xpviewer/src/makefile.win
View File

@@ -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 \