From f5a5c7feef29a77a9b267672137a8bd05c6a434f Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Fri, 8 May 2009 06:46:38 -0700 Subject: [PATCH] Bug 86396: update NSPR to NSPR_4_8_BETA1. Also fix Bug 491045, bug 476996, bug 485318, bug 485374, bug 427136. --- nsprpub/build/autoconf/config.guess | 10 - nsprpub/config/now.c | 12 +- nsprpub/config/nsinstall.c | 2 +- nsprpub/config/rules.mk | 17 - nsprpub/configure | 231 ++++---- nsprpub/configure.in | 28 - nsprpub/lib/ds/plarena.c | 15 - nsprpub/lib/ds/plds_symvec.opt | 37 -- nsprpub/lib/ds/plhash.c | 16 - nsprpub/lib/libc/src/plc_symvec.opt | 53 -- nsprpub/lib/msgc/src/prgcapi.c | 8 - nsprpub/lib/msgc/src/prmsgc.c | 28 - nsprpub/lib/msgc/tests/gc1.c | 15 - nsprpub/lib/msgc/tests/thrashgc.c | 32 -- nsprpub/lib/prstreams/prstrms.cpp | 4 - nsprpub/pr/include/md/Makefile.in | 16 - nsprpub/pr/include/md/_linux.cfg | 52 ++ nsprpub/pr/include/md/_linux.h | 14 + nsprpub/pr/include/md/_openvms.cfg | 148 ------ nsprpub/pr/include/md/_openvms.h | 333 ------------ nsprpub/pr/include/md/_pth.h | 8 +- nsprpub/pr/include/md/_unixos.h | 4 - nsprpub/pr/include/md/prosdep.h | 3 - nsprpub/pr/include/obsolete/probslet.h | 4 - nsprpub/pr/include/obsolete/protypes.h | 45 +- nsprpub/pr/include/prenv.h | 7 - nsprpub/pr/include/prinet.h | 3 +- nsprpub/pr/include/prinit.h | 2 +- nsprpub/pr/include/private/pprio.h | 9 - nsprpub/pr/include/private/pprthred.h | 10 - nsprpub/pr/include/private/primpl.h | 20 - nsprpub/pr/include/private/prpriv.h | 5 - nsprpub/pr/include/prlink.h | 8 +- nsprpub/pr/include/prtypes.h | 22 +- nsprpub/pr/src/io/prfile.c | 32 +- nsprpub/pr/src/io/prio.c | 6 - nsprpub/pr/src/io/prlog.c | 50 +- nsprpub/pr/src/io/prmapopt.c | 22 - nsprpub/pr/src/io/prmwait.c | 3 - nsprpub/pr/src/io/prpolevt.c | 81 --- nsprpub/pr/src/io/prsocket.c | 19 - nsprpub/pr/src/linking/prlink.c | 154 ------ nsprpub/pr/src/md/prosdep.c | 4 - nsprpub/pr/src/md/unix/openvms.c | 286 ---------- nsprpub/pr/src/md/unix/uxproces.c | 99 ---- nsprpub/pr/src/md/unix/uxrng.c | 18 - nsprpub/pr/src/md/windows/ntsec.c | 3 +- nsprpub/pr/src/misc/pralarm.c | 4 - nsprpub/pr/src/misc/prenv.c | 10 - nsprpub/pr/src/misc/prinit.c | 19 +- nsprpub/pr/src/misc/prnetdb.c | 13 +- nsprpub/pr/src/misc/prolock.c | 12 - nsprpub/pr/src/misc/prsystem.c | 6 - nsprpub/pr/src/misc/prthinfo.c | 7 - nsprpub/pr/src/misc/prtime.c | 18 +- nsprpub/pr/src/nspr_symvec.opt | 503 ------------------ nsprpub/pr/src/prvrsion.c | 2 - nsprpub/pr/src/pthreads/ptio.c | 11 +- nsprpub/pr/src/pthreads/ptthread.c | 14 +- nsprpub/pr/src/threads/combined/prucpu.c | 3 - nsprpub/pr/src/threads/combined/prucv.c | 4 - nsprpub/pr/src/threads/combined/prulock.c | 8 - nsprpub/pr/src/threads/combined/pruthr.c | 23 - nsprpub/pr/src/threads/prcthr.c | 20 - nsprpub/pr/src/threads/prsem.c | 4 - nsprpub/pr/tests/Makefile.in | 1 + nsprpub/pr/tests/accept.c | 7 +- nsprpub/pr/tests/alarm.c | 18 - nsprpub/pr/tests/cltsrv.c | 10 - nsprpub/pr/tests/concur.c | 4 - nsprpub/pr/tests/cvar.c | 11 - nsprpub/pr/tests/cvar2.c | 16 - nsprpub/pr/tests/fileio.c | 12 - nsprpub/pr/tests/inrval.c | 4 - nsprpub/pr/tests/intrio.c | 6 - nsprpub/pr/tests/intrupt.c | 11 - nsprpub/pr/tests/io_timeout.c | 11 - nsprpub/pr/tests/join.c | 12 - nsprpub/pr/tests/joinkk.c | 11 - nsprpub/pr/tests/joinku.c | 10 - nsprpub/pr/tests/joinuk.c | 10 - nsprpub/pr/tests/joinuu.c | 10 - nsprpub/pr/tests/lock.c | 11 - nsprpub/pr/tests/lockfile.c | 15 - nsprpub/pr/tests/logger.c | 8 - nsprpub/pr/tests/nbconn.c | 40 -- nsprpub/pr/tests/nonblock.c | 18 - nsprpub/pr/tests/op_2long.c | 10 - nsprpub/pr/tests/op_filnf.c | 13 - nsprpub/pr/tests/op_filok.c | 15 +- nsprpub/pr/tests/op_noacc.c | 12 - nsprpub/pr/tests/op_nofil.c | 11 - nsprpub/pr/tests/perf.c | 11 - nsprpub/pr/tests/poll_er.c | 2 - nsprpub/pr/tests/poll_nm.c | 23 - nsprpub/pr/tests/poll_to.c | 4 - nsprpub/pr/tests/priotest.c | 7 - nsprpub/pr/tests/provider.c | 10 - nsprpub/pr/tests/prpoll.c | 4 - nsprpub/pr/tests/ranfile.c | 11 - .../msgc/src/macgc.c => pr/tests/reinit.c} | 59 +- nsprpub/pr/tests/runtests.pl | 1 + nsprpub/pr/tests/runtests.sh | 1 + nsprpub/pr/tests/sel_spd.c | 21 +- nsprpub/pr/tests/selct_er.c | 2 - nsprpub/pr/tests/selct_nm.c | 4 - nsprpub/pr/tests/selct_to.c | 4 - nsprpub/pr/tests/sem.c | 12 - nsprpub/pr/tests/socket.c | 25 - nsprpub/pr/tests/sockopt.c | 26 - nsprpub/pr/tests/suspend.c | 15 - nsprpub/pr/tests/switch.c | 5 - nsprpub/pr/tests/testfile.c | 74 +-- nsprpub/pr/tests/threads.c | 14 - nsprpub/pr/tests/thrpool_client.c | 15 - nsprpub/pr/tests/thrpool_server.c | 15 - nsprpub/pr/tests/timemac.c | 10 - nsprpub/pr/tests/timetest.c | 21 - nsprpub/pr/tests/tmoacc.c | 5 - nsprpub/pr/tests/tmocon.c | 5 - nsprpub/pr/tests/tpd.c | 4 - nsprpub/pr/tests/udpsrv.c | 4 - nsprpub/pr/tests/writev.c | 5 - nsprpub/pr/tests/y2k.c | 22 - 124 files changed, 273 insertions(+), 3164 deletions(-) delete mode 100644 nsprpub/lib/ds/plds_symvec.opt delete mode 100644 nsprpub/lib/libc/src/plc_symvec.opt delete mode 100644 nsprpub/pr/include/md/_openvms.cfg delete mode 100644 nsprpub/pr/include/md/_openvms.h delete mode 100644 nsprpub/pr/src/md/unix/openvms.c delete mode 100644 nsprpub/pr/src/nspr_symvec.opt rename nsprpub/{lib/msgc/src/macgc.c => pr/tests/reinit.c} (65%) diff --git a/nsprpub/build/autoconf/config.guess b/nsprpub/build/autoconf/config.guess index a20b311747f..dfe628c599e 100755 --- a/nsprpub/build/autoconf/config.guess +++ b/nsprpub/build/autoconf/config.guess @@ -1134,16 +1134,6 @@ EOF # says echo i586-unisys-sysv4 exit ;; -#### MozillaHack - *:*OpenVMS*:*:*) - case "${UNAME_SYSTEM}" in - POSIX_for_OpenVMS_AXP) echo alpha-dec-openvmsposix ;; - POSIX_for_OpenVMS_VAX) echo vax-dec-openvmsposix ;; - OpenVMS) echo alpha-dec-openvms ;; - *) echo unknown-dec-openvms ;; - esac - exit ;; -#### End MozillaHack *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm diff --git a/nsprpub/config/now.c b/nsprpub/config/now.c index 42cd2a9bd36..3af5f4471b3 100644 --- a/nsprpub/config/now.c +++ b/nsprpub/config/now.c @@ -38,9 +38,7 @@ #include #include -#if defined(VMS) -#include -#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) +#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) #include #elif defined(_WIN32) #include @@ -62,14 +60,6 @@ int main(int argc, char **argv) * of this program and omit the library build time * in PRVersionDescription. */ -#elif defined(VMS) - long long now; - struct timeb b; - ftime(&b); - now = b.time; - now *= 1000000; - now += (1000 * b.millitm); - fprintf(stdout, "%Ld", now); #elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) long long now; struct timeval tv; diff --git a/nsprpub/config/nsinstall.c b/nsprpub/config/nsinstall.c index 80d907edf23..b4b8fde0479 100644 --- a/nsprpub/config/nsinstall.c +++ b/nsprpub/config/nsinstall.c @@ -70,7 +70,7 @@ * Does getcwd() take NULL as the first argument and malloc * the result buffer? */ -#if !defined(DARWIN) && !defined(NEXTSTEP) && !defined(VMS) +#if !defined(DARWIN) && !defined(NEXTSTEP) #define GETCWD_CAN_MALLOC #endif diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk index ac52a4f53e9..9259916bead 100644 --- a/nsprpub/config/rules.mk +++ b/nsprpub/config/rules.mk @@ -168,15 +168,6 @@ ALL_TRASH = $(TARGETS) $(OBJS) $(RES) $(filter-out . .., $(OBJDIR)) LOGS TAGS $ $(NOSUCHFILE) \ so_locations -ifeq ($(OS_ARCH),OpenVMS) -ALL_TRASH += $(wildcard *.c*_defines) -ifdef SHARED_LIBRARY -VMS_SYMVEC_FILE = $(SHARED_LIBRARY:.$(DLL_SUFFIX)=_symvec.opt) -VMS_SYMVEC_FILE_MODULE = $(srcdir)/$(LIBRARY_NAME)_symvec.opt -ALL_TRASH += $(VMS_SYMVEC_FILE) -endif -endif - ifndef RELEASE_LIBS_DEST RELEASE_LIBS_DEST = $(RELEASE_LIB_DIR) endif @@ -345,14 +336,6 @@ ifdef MT fi endif # MSVC with manifest tool else # WINNT && !GCC -ifeq ($(OS_TARGET), OpenVMS) - @if test ! -f $(VMS_SYMVEC_FILE); then \ - if test -f $(VMS_SYMVEC_FILE_MODULE); then \ - echo Creating component options file $(VMS_SYMVEC_FILE); \ - cp $(VMS_SYMVEC_FILE_MODULE) $(VMS_SYMVEC_FILE); \ - fi; \ - fi -endif # OpenVMS $(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS) endif # WINNT && !GCC endif # AIX 4.1 diff --git a/nsprpub/configure b/nsprpub/configure index ca0d233ec5f..542542d886b 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -1012,10 +1012,6 @@ if test -z "$CC"; then CC=cc ;; - *-openvms*) - CC=cc - ;; - *-osf*) CC=cc ;; @@ -1056,10 +1052,6 @@ if test -z "$CXX"; then CXX=CC ;; - *-openvms*) - CXX=cxx - ;; - *-osf*) CXX=cxx ;; @@ -1075,7 +1067,7 @@ if test -z "$SKIP_PATH_CHECKS"; then # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. set dummy $WHOAMI whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1079: checking for $ac_word" >&5 +echo "configure:1071: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1146,13 +1138,13 @@ if test "$target" != "$host"; then _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:1150: checking for $host compiler" >&5 +echo "configure:1142: checking for $host compiler" >&5 for ac_prog in $HOST_CC gcc cc /usr/ucb/cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1156: checking for $ac_word" >&5 +echo "configure:1148: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1198,16 +1190,16 @@ test -n "$HOST_CC" || HOST_CC="""" LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1202: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1194: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1236,7 +1228,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1240: checking for $ac_word" >&5 +echo "configure:1232: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1270,7 +1262,7 @@ test -n "$CC" || CC="echo" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1274: checking for $ac_word" >&5 +echo "configure:1266: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1300,7 +1292,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1304: checking for $ac_word" >&5 +echo "configure:1296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1351,7 +1343,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1355: checking for $ac_word" >&5 +echo "configure:1347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1383,7 +1375,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1379: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1394,12 +1386,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1398 "configure" +#line 1390 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1425,12 +1417,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1429: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1421: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1434: checking whether we are using GNU C" >&5 +echo "configure:1426: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1439,7 +1431,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1458,7 +1450,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1462: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1454: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1495,7 +1487,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1499: checking for $ac_word" >&5 +echo "configure:1491: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1531,7 +1523,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1535: checking for $ac_word" >&5 +echo "configure:1527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1563,7 +1555,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1567: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1559: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1574,12 +1566,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1578 "configure" +#line 1570 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1605,12 +1597,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1609: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1601: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1614: checking whether we are using GNU C++" >&5 +echo "configure:1606: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1619,7 +1611,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1638,7 +1630,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1642: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1634: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1683,7 +1675,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1687: checking for $ac_word" >&5 +echo "configure:1679: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1718,7 +1710,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1722: checking for $ac_word" >&5 +echo "configure:1714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1753,7 +1745,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1757: checking for $ac_word" >&5 +echo "configure:1749: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1788,7 +1780,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1792: checking for $ac_word" >&5 +echo "configure:1784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1815,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1827: checking for $ac_word" >&5 +echo "configure:1819: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1858,7 +1850,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1862: checking for $ac_word" >&5 +echo "configure:1854: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1893,7 +1885,7 @@ else # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1897: checking for $ac_word" >&5 +echo "configure:1889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1923,7 +1915,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1927: checking for $ac_word" >&5 +echo "configure:1919: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1974,7 +1966,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1978: checking for $ac_word" >&5 +echo "configure:1970: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2006,7 +1998,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2010: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2002: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2017,12 +2009,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2021 "configure" +#line 2013 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2048,12 +2040,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2052: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2044: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2057: checking whether we are using GNU C" >&5 +echo "configure:2049: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2062,7 +2054,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2081,7 +2073,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2085: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2077: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2121,7 +2113,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2125: checking for $ac_word" >&5 +echo "configure:2117: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2153,7 +2145,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2157: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2149: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2164,12 +2156,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2168 "configure" +#line 2160 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2195,12 +2187,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2199: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2191: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2204: checking whether we are using GNU C++" >&5 +echo "configure:2196: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2201,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2228,7 +2220,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2232: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2224: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2262,7 +2254,7 @@ fi fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2266: checking how to run the C preprocessor" >&5 +echo "configure:2258: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2277,13 +2269,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2294,13 +2286,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2311,13 +2303,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2344,7 +2336,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2348: checking for $ac_word" >&5 +echo "configure:2340: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2376,7 +2368,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2380: checking for $ac_word" >&5 +echo "configure:2372: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2417,7 +2409,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2421: checking for $ac_word" >&5 +echo "configure:2413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2458,7 +2450,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2462: checking for $ac_word" >&5 +echo "configure:2454: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2499,7 +2491,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2503: checking for $ac_word" >&5 +echo "configure:2495: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2540,7 +2532,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2544: checking for $ac_word" >&5 +echo "configure:2536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2608,7 +2600,7 @@ else fi echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:2612: checking for gcc -pipe support" >&5 +echo "configure:2604: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c @@ -2623,14 +2615,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:2634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -2657,7 +2649,7 @@ fi if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:2661: checking for visibility(hidden) attribute" >&5 +echo "configure:2653: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2681,7 +2673,7 @@ echo "$ac_t""$ac_cv_visibility_hidden" 1>&6 EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:2685: checking for visibility pragma support" >&5 +echo "configure:2677: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2734,7 +2726,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2738: checking for $ac_word" >&5 +echo "configure:2730: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2820,10 +2812,6 @@ if test "$OS_ARCH" = "Linux"; then OS_RELEASE=`echo $OS_RELEASE | awk -F\. '{ print $1 "." $2 }'` fi -if test "$OS_ARCH" = "OpenVMS"; then - OS_RELEASE=`uname -v` -fi - ####################################################################### # Master "Core Components" macros for getting the OS target # ####################################################################### @@ -2986,17 +2974,17 @@ EOF DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 -echo "configure:2990: checking for sys/atomic_op.h" >&5 +echo "configure:2978: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3153,7 +3141,7 @@ EOF _DEBUG_FLAGS='-gdwarf-2 -O0' MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 -echo "configure:3157: checking for gethostbyaddr in -lbind" >&5 +echo "configure:3145: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3161,7 +3149,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4482,31 +4470,6 @@ EOF MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ;; -*-openvms*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define VMS 1 -EOF - - cat >> confdefs.h <<\EOF -#define PR_GETIPNODE_NOT_THREADSAFE 1 -EOF - - RESOLVE_LINK_SYMBOLS=1 - AR_FLAGS='c $@' - MDCPUCFG_H=_openvms.cfg - PR_MD_CSRCS=openvms.c - DSO_LDOPTS='-shared -auto_symvec' - if test -n "$MOZ_DEBUG"; then - DSO_LDOPTS="$DSO_LDOPTS $_DEBUG_FLAGS" - else - DSO_LDOPTS="$DSO_LDOPTS $_OPTIMIZE_FLAGS" - fi - ;; - *-osf*) SHELL_OVERRIDE="SHELL = /usr/bin/ksh" cat >> confdefs.h <<\EOF @@ -4542,17 +4505,17 @@ EOF _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4546: checking for machine/builtins.h" >&5 +echo "configure:4509: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5201,7 +5164,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5205: checking for dlopen in -ldl" >&5 +echo "configure:5168: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5209,7 +5172,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5237,17 +5200,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:5241: checking for dlfcn.h" >&5 +echo "configure:5204: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5280,13 +5243,13 @@ esac if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5284: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5247: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -5304,7 +5267,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5328,12 +5291,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5332: checking for $ac_func" >&5 +echo "configure:5295: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5397,7 +5360,7 @@ hpux*) if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5401: checking for +Olit support" >&5 +echo "configure:5364: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5436,7 +5399,7 @@ darwin*) *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5440: checking for pthread_create in -lpthreads" >&5 +echo "configure:5403: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { return v; } @@ -5458,7 +5421,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5462: checking for pthread_create in -lpthread" >&5 +echo "configure:5425: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { return v; } @@ -5480,7 +5443,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5484: checking for pthread_create in -lc_r" >&5 +echo "configure:5447: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { return v; } @@ -5502,7 +5465,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5506: checking for pthread_create in -lc" >&5 +echo "configure:5469: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { return v; } @@ -5634,7 +5597,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5638: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5601: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5657,7 +5620,7 @@ echo "configure:5638: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:5661: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5624: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 01ebab81326..50cecd44a9c 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -312,10 +312,6 @@ if test -z "$CC"; then CC=cc ;; - *-openvms*) - CC=cc - ;; - *-osf*) CC=cc ;; @@ -361,10 +357,6 @@ if test -z "$CXX"; then CXX=CC ;; - *-openvms*) - CXX=cxx - ;; - *-osf*) CXX=cxx ;; @@ -681,10 +673,6 @@ if test "$OS_ARCH" = "Linux"; then OS_RELEASE=`echo $OS_RELEASE | awk -F\. '{ print $1 "." $2 }'` fi -if test "$OS_ARCH" = "OpenVMS"; then - OS_RELEASE=`uname -v` -fi - ####################################################################### # Master "Core Components" macros for getting the OS target # ####################################################################### @@ -1835,22 +1823,6 @@ mips-sony-newsos*) MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' ;; -*-openvms*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(VMS) - AC_DEFINE(PR_GETIPNODE_NOT_THREADSAFE) - RESOLVE_LINK_SYMBOLS=1 - AR_FLAGS='c $@' - MDCPUCFG_H=_openvms.cfg - PR_MD_CSRCS=openvms.c - DSO_LDOPTS='-shared -auto_symvec' - if test -n "$MOZ_DEBUG"; then - DSO_LDOPTS="$DSO_LDOPTS $_DEBUG_FLAGS" - else - DSO_LDOPTS="$DSO_LDOPTS $_OPTIMIZE_FLAGS" - fi - ;; - *-osf*) SHELL_OVERRIDE="SHELL = /usr/bin/ksh" AC_DEFINE(XP_UNIX) diff --git a/nsprpub/lib/ds/plarena.c b/nsprpub/lib/ds/plarena.c index c41d6b0a4f4..2d274588474 100644 --- a/nsprpub/lib/ds/plarena.c +++ b/nsprpub/lib/ds/plarena.c @@ -108,10 +108,6 @@ static void UnlockArena( void ) PR_IMPLEMENT(void) PL_InitArenaPool( PLArenaPool *pool, const char *name, PRUint32 size, PRUint32 align) { -#if defined(XP_MAC) -#pragma unused (name) -#endif - /* * Look-up table of PR_BITMASK(PR_CeilingLog2(align)) values for * align = 1 to 32. @@ -345,17 +341,6 @@ PR_IMPLEMENT(void) PL_FinishArenaPool(PLArenaPool *pool) PR_IMPLEMENT(void) PL_CompactArenaPool(PLArenaPool *ap) { -#if XP_MAC -#pragma unused (ap) -#if 0 - PRArena *curr = &(ap->first); - while (curr) { - reallocSmaller(curr, curr->avail - (uprword_t)curr); - curr->limit = curr->avail; - curr = curr->next; - } -#endif -#endif } PR_IMPLEMENT(void) PL_ArenaFinish(void) diff --git a/nsprpub/lib/ds/plds_symvec.opt b/nsprpub/lib/ds/plds_symvec.opt deleted file mode 100644 index 7178454093b..00000000000 --- a/nsprpub/lib/ds/plds_symvec.opt +++ /dev/null @@ -1,37 +0,0 @@ -! Fixed section of symbol vector for LIBPLDS4 -! -GSMATCH=LEQUAL,2,2 -case_sensitive=YES -! -! -------------------------------------------------------------------------- -! Ident 2,2 introduced for Mozilla 1.3 -! Previously this was empty. Now we include everything that's specified in -! plds.def. -! -------------------------------------------------------------------------- -! -! NSPR 4.0 -SYMBOL_VECTOR=(PL_ArenaAllocate=PROCEDURE) -SYMBOL_VECTOR=(PL_ArenaFinish=PROCEDURE) -SYMBOL_VECTOR=(PL_ArenaGrow=PROCEDURE) -SYMBOL_VECTOR=(PL_ArenaRelease=PROCEDURE) -SYMBOL_VECTOR=(PL_CompactArenaPool=PROCEDURE) -SYMBOL_VECTOR=(PL_CompareStrings=PROCEDURE) -SYMBOL_VECTOR=(PL_CompareValues=PROCEDURE) -SYMBOL_VECTOR=(PL_FinishArenaPool=PROCEDURE) -SYMBOL_VECTOR=(PL_FreeArenaPool=PROCEDURE) -SYMBOL_VECTOR=(PL_HashString=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableAdd=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableDestroy=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableDump=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableEnumerateEntries=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableLookup=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableRawAdd=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableRawLookup=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableRawRemove=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableRemove=PROCEDURE) -SYMBOL_VECTOR=(PL_InitArenaPool=PROCEDURE) -SYMBOL_VECTOR=(PL_NewHashTable=PROCEDURE) -SYMBOL_VECTOR=(libVersionPoint=PROCEDURE) -! NSPR 4.1 -SYMBOL_VECTOR=(PL_HashTableLookupConst=PROCEDURE) -SYMBOL_VECTOR=(PL_HashTableRawLookupConst=PROCEDURE) diff --git a/nsprpub/lib/ds/plhash.c b/nsprpub/lib/ds/plhash.c index f82e2da8ee6..4f69d04d384 100644 --- a/nsprpub/lib/ds/plhash.c +++ b/nsprpub/lib/ds/plhash.c @@ -65,40 +65,24 @@ static void * PR_CALLBACK DefaultAllocTable(void *pool, PRSize size) { -#if defined(XP_MAC) -#pragma unused (pool) -#endif - return PR_MALLOC(size); } static void PR_CALLBACK DefaultFreeTable(void *pool, void *item) { -#if defined(XP_MAC) -#pragma unused (pool) -#endif - PR_Free(item); } static PLHashEntry * PR_CALLBACK DefaultAllocEntry(void *pool, const void *key) { -#if defined(XP_MAC) -#pragma unused (pool,key) -#endif - return PR_NEW(PLHashEntry); } static void PR_CALLBACK DefaultFreeEntry(void *pool, PLHashEntry *he, PRUintn flag) { -#if defined(XP_MAC) -#pragma unused (pool) -#endif - if (flag == HT_FREE_ENTRY) PR_Free(he); } diff --git a/nsprpub/lib/libc/src/plc_symvec.opt b/nsprpub/lib/libc/src/plc_symvec.opt deleted file mode 100644 index 8bc769e0b4c..00000000000 --- a/nsprpub/lib/libc/src/plc_symvec.opt +++ /dev/null @@ -1,53 +0,0 @@ -! Fixed section of symbol vector for LIBPLC4 -! -GSMATCH=LEQUAL,2,2 -case_sensitive=YES -! -! -------------------------------------------------------------------------- -! Ident 2,2 introduced for Mozilla 1.3 -! Previously this was empty. Now we include everything that's specified in -! plc.def. -! -------------------------------------------------------------------------- -! -! NSPR 4.0 -SYMBOL_VECTOR=(PL_Base64Decode=PROCEDURE) -SYMBOL_VECTOR=(PL_Base64Encode=PROCEDURE) -SYMBOL_VECTOR=(PL_CreateOptState=PROCEDURE) -SYMBOL_VECTOR=(PL_DestroyOptState=PROCEDURE) -SYMBOL_VECTOR=(PL_FPrintError=PROCEDURE) -SYMBOL_VECTOR=(PL_GetNextOpt=PROCEDURE) -SYMBOL_VECTOR=(PL_PrintError=PROCEDURE) -SYMBOL_VECTOR=(PL_strcasecmp=PROCEDURE) -SYMBOL_VECTOR=(PL_strcaserstr=PROCEDURE) -SYMBOL_VECTOR=(PL_strcasestr=PROCEDURE) -SYMBOL_VECTOR=(PL_strcat=PROCEDURE) -SYMBOL_VECTOR=(PL_strcatn=PROCEDURE) -SYMBOL_VECTOR=(PL_strchr=PROCEDURE) -SYMBOL_VECTOR=(PL_strcmp=PROCEDURE) -SYMBOL_VECTOR=(PL_strcpy=PROCEDURE) -SYMBOL_VECTOR=(PL_strdup=PROCEDURE) -SYMBOL_VECTOR=(PL_strfree=PROCEDURE) -SYMBOL_VECTOR=(PL_strlen=PROCEDURE) -SYMBOL_VECTOR=(PL_strncasecmp=PROCEDURE) -SYMBOL_VECTOR=(PL_strncaserstr=PROCEDURE) -SYMBOL_VECTOR=(PL_strncasestr=PROCEDURE) -SYMBOL_VECTOR=(PL_strncat=PROCEDURE) -SYMBOL_VECTOR=(PL_strnchr=PROCEDURE) -SYMBOL_VECTOR=(PL_strncmp=PROCEDURE) -SYMBOL_VECTOR=(PL_strncpy=PROCEDURE) -SYMBOL_VECTOR=(PL_strncpyz=PROCEDURE) -SYMBOL_VECTOR=(PL_strndup=PROCEDURE) -SYMBOL_VECTOR=(PL_strnlen=PROCEDURE) -SYMBOL_VECTOR=(PL_strnpbrk=PROCEDURE) -SYMBOL_VECTOR=(PL_strnprbrk=PROCEDURE) -SYMBOL_VECTOR=(PL_strnrchr=PROCEDURE) -SYMBOL_VECTOR=(PL_strnrstr=PROCEDURE) -SYMBOL_VECTOR=(PL_strnstr=PROCEDURE) -SYMBOL_VECTOR=(PL_strpbrk=PROCEDURE) -SYMBOL_VECTOR=(PL_strprbrk=PROCEDURE) -SYMBOL_VECTOR=(PL_strrchr=PROCEDURE) -SYMBOL_VECTOR=(PL_strrstr=PROCEDURE) -SYMBOL_VECTOR=(PL_strstr=PROCEDURE) -SYMBOL_VECTOR=(libVersionPoint=PROCEDURE) -! NSPR 4.2 -SYMBOL_VECTOR=(PL_strtok_r=PROCEDURE) diff --git a/nsprpub/lib/msgc/src/prgcapi.c b/nsprpub/lib/msgc/src/prgcapi.c index 6b87220f8ae..324ac7b9303 100644 --- a/nsprpub/lib/msgc/src/prgcapi.c +++ b/nsprpub/lib/msgc/src/prgcapi.c @@ -43,11 +43,7 @@ #include "prmon.h" #include "prlog.h" #include "prthread.h" -#if defined(XP_MAC) -#include "pprthred.h" -#else #include "private/pprthred.h" -#endif #include "gcint.h" /* @@ -82,10 +78,6 @@ extern PRLogModuleInfo *_pr_msgc_lm; static PRStatus PR_CALLBACK pr_ScanOneThread(PRThread* t, void** addr, PRUword count, void* closure) { -#if defined(XP_MAC) -#pragma unused (t, closure) -#endif - _pr_gcData.processRootBlock(addr, count); return PR_SUCCESS; } diff --git a/nsprpub/lib/msgc/src/prmsgc.c b/nsprpub/lib/msgc/src/prmsgc.c index 13393df070b..2c1e8539759 100644 --- a/nsprpub/lib/msgc/src/prmsgc.c +++ b/nsprpub/lib/msgc/src/prmsgc.c @@ -58,11 +58,7 @@ #include "prprf.h" #include "gcint.h" -#if defined(XP_MAC) -#include "pprthred.h" -#else #include "private/pprthred.h" -#endif typedef void (*PRFileDumper)(FILE *out, PRBool detailed); @@ -130,11 +126,7 @@ static PRInt32 _pr_pageSize; /* The minimum percentage of free heap space after a collection. If the amount of free space doesn't meet this criteria then we will attempt to grow the heap */ -#ifdef XP_MAC -#define MIN_FREE_THRESHOLD_AFTER_GC 10L -#else #define MIN_FREE_THRESHOLD_AFTER_GC 20L -#endif static PRInt32 segmentSize = SEGMENT_SIZE; @@ -1287,9 +1279,6 @@ static void PrepareFinalize(void) */ extern void PR_CALLBACK _PR_ScanFinalQueue(void *notused) { -#ifdef XP_MAC -#pragma unused (notused) -#endif PRCList *qp; GCFinal *fp; PRWord *p; @@ -1308,9 +1297,6 @@ extern void PR_CALLBACK _PR_ScanFinalQueue(void *notused) void PR_CALLBACK FinalizerLoop(void* unused) { -#ifdef XP_MAC -#pragma unused (unused) -#endif GCFinal *fp; PRWord *p; PRWord h, tix; @@ -1421,9 +1407,6 @@ PRCList _pr_freeWeakLinks = PR_INIT_STATIC_CLIST(&_pr_freeWeakLinks); * freed */ static void PR_CALLBACK ScanWeakFreeList(void *notused) { -#ifdef XP_MAC -#pragma unused (notused) -#endif PRCList *qp = _pr_freeWeakLinks.next; while (qp != &_pr_freeWeakLinks) { GCWeak *wp = WeakPtr(qp); @@ -1951,10 +1934,6 @@ pr_DumpUnknown(FILE *out, GCType* tp, PRWord tix, PRWord *p, static void PR_CALLBACK pr_DumpFree(FILE *out, PRWord *p, size_t size, PRBool detailed) { -#if defined(XP_MAC) && XP_MAC -# pragma unused( detailed ) -#endif - fprintf(out, "0x%p: 0x%.6lX - FREE\n", p, (long) size); } @@ -2003,9 +1982,6 @@ PR_DumpMemory(PRBool detailed) static PRInt32 PR_CALLBACK pr_DumpRootPointer(PRWord* p, void* data) { -#ifdef XP_MAC -#pragma unused(data) -#endif PRWord h = p[0]; PRWord tix = GET_TYPEIX(h); size_t bytes = OBJ_BYTES(h); @@ -2089,10 +2065,6 @@ static void PR_CALLBACK pr_SummarizeObject(FILE *out, GCType* tp, PRWord *p, size_t bytes, PRBool detailed) { -#if defined(XP_MAC) && XP_MAC -# pragma unused( out, detailed ) -#endif - if (tp->summarize) (*tp->summarize)((void GCPTR*)(p + 1), bytes); } diff --git a/nsprpub/lib/msgc/tests/gc1.c b/nsprpub/lib/msgc/tests/gc1.c index d6846235ba4..9bd485e9248 100644 --- a/nsprpub/lib/msgc/tests/gc1.c +++ b/nsprpub/lib/msgc/tests/gc1.c @@ -45,21 +45,11 @@ #include "prinit.h" #include "prmon.h" #include "prinrval.h" -#ifndef XP_MAC #include "private/pprthred.h" -#else -#include "pprthred.h" -#endif #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static PRMonitor *mon; static PRInt32 threads, waiting, iterations; static PRInt32 scanCount, finalizeCount, freeCount; @@ -193,11 +183,6 @@ int main(int argc, char **argv) PR_STDIO_INIT(); Initialize(); -#ifdef XP_MAC - SetupMacPrintfLog("gc1.log"); - debug_mode = 1; -#endif - /* Spin all of the allocator threads and then wait for them to exit */ start = PR_IntervalNow(); mon = PR_NewMonitor(); diff --git a/nsprpub/lib/msgc/tests/thrashgc.c b/nsprpub/lib/msgc/tests/thrashgc.c index 9d49ec19f30..a440d4949b1 100644 --- a/nsprpub/lib/msgc/tests/thrashgc.c +++ b/nsprpub/lib/msgc/tests/thrashgc.c @@ -60,23 +60,13 @@ #include "prinit.h" #include "prcvar.h" -#ifndef XP_MAC #include "private/pprthred.h" -#else -#include "pprthred.h" -#endif #include #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - PRIntn failed_already=0; PRIntn debug_mode; @@ -169,20 +159,12 @@ static void PR_CALLBACK AllocStuff(void *unused) { PR_GetCurrentThread(), loops, PR_IntervalToMilliseconds((PRIntervalTime) (end - start))); PR_Lock(stderrLock); -#ifndef XP_MAC fprintf(stderr, "%s\n", msg); -#else - if (debug_mode) printf("%s\n", msg); -#endif PR_Unlock(stderrLock); } static void usage(char *progname) { -#ifndef XP_MAC fprintf(stderr, "Usage: %s [-t threads] [-l loops]\n", progname); -#else - printf("Usage: %s [-t threads] [-l loops]\n", progname); -#endif exit(-1); } @@ -190,7 +172,6 @@ static int realMain(int argc, char **argv, char *notused) { int i; int threads = 0; -#ifndef XP_MAC progname = strrchr(argv[0], '/'); if (progname == 0) progname = argv[0]; for (i = 1; i < argc; i++) { @@ -212,9 +193,6 @@ static int realMain(int argc, char **argv, char *notused) { } usage(progname); } -#else - threads = 50; -#endif for (i = 0; i < threads; i++) { PRThread* thread; @@ -228,13 +206,8 @@ static int realMain(int argc, char **argv, char *notused) { PR_UNJOINABLE_THREAD, /* thread state */ 0); /* stack size */ if (thread == 0) { -#ifndef XP_MAC fprintf(stderr, "%s: no more threads (only %d were created)\n", progname, i); -#else - printf("%s: no more threads (only %d were created)\n", - progname, i); -#endif break; } } @@ -255,11 +228,6 @@ int main(int argc, char **argv) { PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_SetThreadGCAble(); -#ifdef XP_MAC - SetupMacPrintfLog("thrashgc.log"); - debug_mode = 1; -#endif - PR_InitGC(0, 0, 0, PR_GLOBAL_THREAD); PR_STDIO_INIT(); stderrLock = PR_NewLock(); diff --git a/nsprpub/lib/prstreams/prstrms.cpp b/nsprpub/lib/prstreams/prstrms.cpp index 17b280ea1f1..9f709c067ae 100644 --- a/nsprpub/lib/prstreams/prstrms.cpp +++ b/nsprpub/lib/prstreams/prstrms.cpp @@ -64,10 +64,6 @@ #define _PRSTR_BP bp #define _PRSTR_DELBUF(x) delbuf(x) #define _PRSTR_DELBUF_C(c, x) c::_PRSTR_DELBUF(x) -#elif defined(VMS) -#undef _PRSTR_BP -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ #elif defined(OSF1) #define _PRSTR_BP m_psb #define _PRSTR_DELBUF(x) /* as nothing */ diff --git a/nsprpub/pr/include/md/Makefile.in b/nsprpub/pr/include/md/Makefile.in index 24a0a9b87bc..af369bedb09 100644 --- a/nsprpub/pr/include/md/Makefile.in +++ b/nsprpub/pr/include/md/Makefile.in @@ -53,29 +53,13 @@ include $(topsrcdir)/config/rules.mk export:: $(MDCPUCFG_H) $(INSTALL) -m 444 $(CONFIGS) $(dist_includedir)/md $(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(dist_includedir) -ifeq ($(OS_ARCH),OpenVMS) -# On OpenVMS mv updates the file's modified time, so we create a hard link. - cd $(dist_includedir); \ - if test ! -f prcpucfg.h; then \ - dcl set file /enter=prcpucfg.h $(MDCPUCFG_H); \ - fi -else mv -f $(dist_includedir)/$(MDCPUCFG_H) $(dist_includedir)/prcpucfg.h -endif install:: $(NSINSTALL) -D $(DESTDIR)$(includedir)/md $(NSINSTALL) -t -m 644 $(CONFIGS) $(DESTDIR)$(includedir)/md $(NSINSTALL) -t -m 644 $(srcdir)/$(MDCPUCFG_H) $(DESTDIR)$(includedir) -ifeq ($(OS_ARCH),OpenVMS) -# On OpenVMS mv updates the file's modified time, so we create a hard link. - cd $(DESTDIR)$(includedir); \ - if test ! -f prcpucfg.h; then \ - dcl set file /enter=prcpucfg.h $(MDCPUCFG_H); \ - fi -else mv -f $(DESTDIR)$(includedir)/$(MDCPUCFG_H) $(DESTDIR)$(includedir)/prcpucfg.h -endif release:: export @echo "Copying machine-dependent prcpucfg.h" diff --git a/nsprpub/pr/include/md/_linux.cfg b/nsprpub/pr/include/md/_linux.cfg index 1999d3cf90f..394b8371d61 100644 --- a/nsprpub/pr/include/md/_linux.cfg +++ b/nsprpub/pr/include/md/_linux.cfg @@ -521,8 +521,15 @@ #elif defined(__arm__) +#ifdef __ARMEB__ +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 +#elif defined(__ARMEL__) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN +#else +#error "Unknown ARM endianness." +#endif #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 @@ -700,6 +707,51 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__sh__) + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define PR_BYTES_PER_BYTE 1 +#define PR_BYTES_PER_SHORT 2 +#define PR_BYTES_PER_INT 4 +#define PR_BYTES_PER_INT64 8 +#define PR_BYTES_PER_LONG 4 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 4 +#define PR_BYTES_PER_DWORD 8 + +#define PR_BITS_PER_BYTE 8 +#define PR_BITS_PER_SHORT 16 +#define PR_BITS_PER_INT 32 +#define PR_BITS_PER_INT64 64 +#define PR_BITS_PER_LONG 32 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 32 + +#define PR_BITS_PER_BYTE_LOG2 3 +#define PR_BITS_PER_SHORT_LOG2 4 +#define PR_BITS_PER_INT_LOG2 5 +#define PR_BITS_PER_INT64_LOG2 6 +#define PR_BITS_PER_LONG_LOG2 5 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 5 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 4 +#define PR_ALIGN_OF_INT64 4 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_POINTER 4 +#define PR_ALIGN_OF_WORD 4 + +#define PR_BYTES_PER_WORD_LOG2 2 +#define PR_BYTES_PER_DWORD_LOG2 3 + #else #error "Unknown CPU architecture" diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h index aa9d33bb558..e60e0a911ac 100644 --- a/nsprpub/pr/include/md/_linux.h +++ b/nsprpub/pr/include/md/_linux.h @@ -79,6 +79,8 @@ #define _PR_SI_ARCHITECTURE "s390x" #elif defined(__s390__) #define _PR_SI_ARCHITECTURE "s390" +#elif defined(__sh__) +#define _PR_SI_ARCHITECTURE "sh" #else #error "Unknown CPU architecture" #endif @@ -436,6 +438,18 @@ extern void _MD_CleanupBeforeExit(void); #error "ARM/Linux pre-glibc2 not supported yet" #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ +#elif defined(__sh__) +/* SH/Linux */ +#if defined(__GLIBC__) && __GLIBC__ >= 2 +#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[7] +#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[6] = (val)) +#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) +#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[6]) +#define _MD_SP_TYPE __ptr_t +#else +#error "SH/Linux pre-glibc2 not supported yet" +#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + #else #error "Unknown CPU architecture" diff --git a/nsprpub/pr/include/md/_openvms.cfg b/nsprpub/pr/include/md/_openvms.cfg deleted file mode 100644 index ee8a446a033..00000000000 --- a/nsprpub/pr/include/md/_openvms.cfg +++ /dev/null @@ -1,148 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Netscape Portable Runtime (NSPR). - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * 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 - * 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. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef VMS -#define VMS -#endif - -#define IS_LITTLE_ENDIAN 1 -#undef IS_BIG_ENDIAN -#ifndef HAVE_LONG_LONG -#define HAVE_LONG_LONG -#endif -#define HAVE_ALIGNED_DOUBLES -#define HAVE_ALIGNED_LONGLONGS -#ifdef IS_64 -#undef IS_64 -#endif - -#define PR_AF_INET6 26 /* same as AF_INET6 */ - -#define PR_BYTES_PER_BYTE 1 -#define PR_BYTES_PER_SHORT 2 -#define PR_BYTES_PER_INT 4 -#define PR_BYTES_PER_INT64 8 -#define PR_BYTES_PER_LONG 4 -#define PR_BYTES_PER_FLOAT 4 -#define PR_BYTES_PER_DOUBLE 8 -#define PR_BYTES_PER_WORD 4 -#define PR_BYTES_PER_DWORD 8 - -#define PR_BITS_PER_BYTE 8 -#define PR_BITS_PER_SHORT 16 -#define PR_BITS_PER_INT 32 -#define PR_BITS_PER_INT64 64 -#define PR_BITS_PER_LONG 32 -#define PR_BITS_PER_FLOAT 32 -#define PR_BITS_PER_DOUBLE 64 -#define PR_BITS_PER_WORD 32 - -#define PR_BITS_PER_BYTE_LOG2 3 -#define PR_BITS_PER_SHORT_LOG2 4 -#define PR_BITS_PER_INT_LOG2 5 -#define PR_BITS_PER_INT64_LOG2 6 -#define PR_BITS_PER_LONG_LOG2 5 -#define PR_BITS_PER_FLOAT_LOG2 5 -#define PR_BITS_PER_DOUBLE_LOG2 6 -#define PR_BITS_PER_WORD_LOG2 5 - -#define PR_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#define PR_ALIGN_OF_SHORT 2 -#define PR_ALIGN_OF_INT 4 -#define PR_ALIGN_OF_LONG 4 -#define PR_ALIGN_OF_INT64 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 4 - -#define _PR_POLL_BACKCOMPAT - -#ifndef NO_NSPR_10_SUPPORT - -#define BYTES_PER_BYTE PR_BYTES_PER_BYTE -#define BYTES_PER_SHORT PR_BYTES_PER_SHORT -#define BYTES_PER_INT PR_BYTES_PER_INT -#define BYTES_PER_INT64 PR_BYTES_PER_INT64 -#define BYTES_PER_LONG PR_BYTES_PER_LONG -#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT -#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE -#define BYTES_PER_WORD PR_BYTES_PER_WORD -#define BYTES_PER_DWORD PR_BYTES_PER_DWORD - -#define BITS_PER_BYTE PR_BITS_PER_BYTE -#define BITS_PER_SHORT PR_BITS_PER_SHORT -#define BITS_PER_INT PR_BITS_PER_INT -#define BITS_PER_INT64 PR_BITS_PER_INT64 -#define BITS_PER_LONG PR_BITS_PER_LONG -#define BITS_PER_FLOAT PR_BITS_PER_FLOAT -#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE -#define BITS_PER_WORD PR_BITS_PER_WORD - -#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2 -#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 -#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 -#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 -#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2 -#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 -#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 -#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2 - -#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT -#define ALIGN_OF_INT PR_ALIGN_OF_INT -#define ALIGN_OF_LONG PR_ALIGN_OF_LONG -#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64 -#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT -#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE -#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER -#define ALIGN_OF_WORD PR_ALIGN_OF_WORD - -#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 -#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 -#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 - -#endif /* NO_NSPR_10_SUPPORT */ - -#endif /* nspr_cpucfg___ */ diff --git a/nsprpub/pr/include/md/_openvms.h b/nsprpub/pr/include/md/_openvms.h deleted file mode 100644 index c2f3dc68f4e..00000000000 --- a/nsprpub/pr/include/md/_openvms.h +++ /dev/null @@ -1,333 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Netscape Portable Runtime (NSPR). - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * 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 - * 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. - * - * ***** END LICENSE BLOCK ***** */ - -/* -** This is the OpenVMS machine dependant configuration file. It is based -** on the OSF/1 machine dependant file. -*/ - -#ifndef nspr_openvms_defs_h___ -#define nspr_openvms_defs_h___ - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "OpenVMS" -#define _PR_SI_SYSNAME "OpenVMS" -#ifdef __alpha -#define _PR_SI_ARCHITECTURE "alpha" -#else -#define _PR_SI_ARCHITECTURE "vax" -#endif -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 131072L -#define _MD_MINIMUM_STACK_SIZE 131072L - -/* -** This is not defined on OpenVMS. I believe its only used in GC code, and -** isn't that only used in Java? Anyway, for now, let's keep the compiler -** happy. -*/ -#define SA_RESTART 0 - -/* -** OpenVMS doesn't have these in socket.h. -** Does in later versions! -*/ -#if 0 -struct ip_mreq { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_interface; /* local IP address of interface */ -}; -#endif - -/* - * OSF1 needs the MAP_FIXED flag to ensure that mmap returns a pointer - * with the upper 32 bits zero. This is because Java sticks a pointer - * into an int. - */ -#define _MD_MMAP_FLAGS MAP_PRIVATE|MAP_FIXED - -#undef HAVE_STACK_GROWING_UP -#undef HAVE_WEAK_IO_SYMBOLS -#undef HAVE_WEAK_MALLOC_SYMBOLS -#undef HAVE_BSD_FLOCK - -#define NEED_TIME_R - -#define HAVE_DLL -#define USE_DLFCN - -#define _PR_POLL_AVAILABLE -#define _PR_USE_POLL -#define _PR_STAT_HAS_ONLY_ST_ATIME -#define _PR_NO_LARGE_FILES -#define _PR_STRICT_ADDR_LEN -#define _PR_NEED_SECRET_AF - -/* IPv6 support */ -#ifdef _SOCKADDR_LEN -#define _PR_HAVE_SOCKADDR_LEN -#endif -#define _PR_HAVE_GETIPNODEBYNAME -#define _PR_HAVE_GETIPNODEBYADDR -#define _PR_HAVE_GETADDRINFO -#define _PR_INET6_PROBE -#ifdef _PR_INET6 -#define _PR_HAVE_INET_NTOP -#else -#define AF_INET6 26 -#ifndef AI_CANONNAME -#define AI_CANONNAME 0x00000002 -struct addrinfo { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char *ai_canonname; - struct sockaddr *ai_addr; - struct addrinfo *ai_next; -}; -#endif -#define AI_V4MAPPED 0x00000010 -#define AI_ALL 0x00000008 -#define AI_ADDRCONFIG 0x00000020 -#endif - -#define _PR_HAVE_MD_SOCKADDR_IN6 -/* if we have a quadword field defined in the structure, then its length */ -/* will be a multiple of 8, and connect() won't accept 32 (it wants 28) */ -struct _md_in6_addr { - union { - PRUint8 _S6_u8[16]; - PRUint16 _S6_u16[8]; - PRUint32 _S6_u32[4]; - } _S6_un; -}; -struct _md_sockaddr_in6 { - PRUint16 sin6_family; - PRUint16 sin6_port; - PRUint32 sin6_flowinfo; - struct _md_in6_addr sin6_addr; - PRUint32 sin6_scope_id; -}; - -#undef USE_SETJMP - -#include - -/* - * A jmp_buf is actually a struct sigcontext. The sc_sp field of - * struct sigcontext is the stack pointer. - */ -#define _MD_GET_SP(_t) (((struct sigcontext *) (_t)->md.context)->sc_sp) -#define PR_NUM_GCREGS _JBLEN -#define CONTEXT(_th) ((_th)->md.context) - -/* -** I am ifdef'ing these out because that's the way they are in FT. -*/ -#ifndef __VMS - -/* -** Initialize a thread context to run "_main()" when started -*/ -#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -{ \ - *status = PR_TRUE; \ - if (setjmp(CONTEXT(_thread))) { \ - (*_main)(); \ - } \ - _MD_GET_SP(_thread) = (long) ((_sp) - 64); \ - _MD_GET_SP(_thread) &= ~15; \ -} - -#define _MD_SWITCH_CONTEXT(_thread) \ - if (!setjmp(CONTEXT(_thread))) { \ - (_thread)->md.errcode = errno; \ - _PR_Schedule(); \ - } - -/* -** Restore a thread context, saved by _MD_SWITCH_CONTEXT -*/ -#define _MD_RESTORE_CONTEXT(_thread) \ -{ \ - errno = (_thread)->md.errcode; \ - _MD_SET_CURRENT_THREAD(_thread); \ - longjmp(CONTEXT(_thread), 1); \ -} - -#endif /* __VMS */ - -/* Machine-dependent (MD) data structures */ - -struct _MDThread { - jmp_buf context; - int id; - int errcode; -}; - -struct _MDThreadStack { - PRInt8 notused; -}; - -struct _MDLock { - PRInt8 notused; -}; - -struct _MDSemaphore { - PRInt8 notused; -}; - -struct _MDCVar { - PRInt8 notused; -}; - -struct _MDSegment { - PRInt8 notused; -}; - -/* - * md-specific cpu structure field - */ -#define _PR_MD_MAX_OSFD FD_SETSIZE - -struct _MDCPU_Unix { - PRCList ioQ; - PRUint32 ioq_timeout; - PRInt32 ioq_max_osfd; - PRInt32 ioq_osfd_cnt; -#ifndef _PR_USE_POLL - fd_set fd_read_set, fd_write_set, fd_exception_set; - PRInt16 fd_read_cnt[_PR_MD_MAX_OSFD],fd_write_cnt[_PR_MD_MAX_OSFD], - fd_exception_cnt[_PR_MD_MAX_OSFD]; -#else - struct pollfd *ioq_pollfds; - int ioq_pollfds_size; -#endif /* _PR_USE_POLL */ -}; - -#define _PR_IOQ(_cpu) ((_cpu)->md.md_unix.ioQ) -#define _PR_ADD_TO_IOQ(_pq, _cpu) PR_APPEND_LINK(&_pq.links, &_PR_IOQ(_cpu)) -#define _PR_FD_READ_SET(_cpu) ((_cpu)->md.md_unix.fd_read_set) -#define _PR_FD_READ_CNT(_cpu) ((_cpu)->md.md_unix.fd_read_cnt) -#define _PR_FD_WRITE_SET(_cpu) ((_cpu)->md.md_unix.fd_write_set) -#define _PR_FD_WRITE_CNT(_cpu) ((_cpu)->md.md_unix.fd_write_cnt) -#define _PR_FD_EXCEPTION_SET(_cpu) ((_cpu)->md.md_unix.fd_exception_set) -#define _PR_FD_EXCEPTION_CNT(_cpu) ((_cpu)->md.md_unix.fd_exception_cnt) -#define _PR_IOQ_TIMEOUT(_cpu) ((_cpu)->md.md_unix.ioq_timeout) -#define _PR_IOQ_MAX_OSFD(_cpu) ((_cpu)->md.md_unix.ioq_max_osfd) -#define _PR_IOQ_OSFD_CNT(_cpu) ((_cpu)->md.md_unix.ioq_osfd_cnt) -#define _PR_IOQ_POLLFDS(_cpu) ((_cpu)->md.md_unix.ioq_pollfds) -#define _PR_IOQ_POLLFDS_SIZE(_cpu) ((_cpu)->md.md_unix.ioq_pollfds_size) - -#define _PR_IOQ_MIN_POLLFDS_SIZE(_cpu) 32 - -struct _MDCPU { - struct _MDCPU_Unix md_unix; -}; - -#ifndef _PR_PTHREADS -#define _MD_INIT_LOCKS() -#endif -#define _MD_NEW_LOCK(lock) PR_SUCCESS -#define _MD_FREE_LOCK(lock) -#define _MD_LOCK(lock) -#define _MD_UNLOCK(lock) -#define _MD_INIT_IO() -#define _MD_IOQ_LOCK() -#define _MD_IOQ_UNLOCK() - -/* - * The following are copied from _sunos.h, _aix.h. This means - * some of them should probably be moved into _unixos.h. But - * _irix.h seems to be quite different in regard to these macros. - */ -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -extern PRIntervalTime _PR_UNIX_GetInterval(void); -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); - -#define _MD_EARLY_INIT _MD_EarlyInit -void _MD_EarlyInit(void); -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#ifdef _VMS_NOT_YET -NSPR_API(void) _PR_InitThreads( - PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs); -#endif -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) -#define _MD_RESUME_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -/* The following defines unwrapped versions of select() and poll(). */ -extern int __select (int, fd_set *, fd_set *, fd_set *, struct timeval *); -#define _MD_SELECT __select - -#ifndef __VMS -#define _MD_POLL __poll -extern int __poll(struct pollfd filedes[], unsigned int nfds, int timeout); -#endif - -#ifdef __VMS -NSPR_API(void) _PR_InitCPUs(void); -NSPR_API(void) _PR_MD_START_INTERRUPTS(void); -#endif - -/* - * Atomic operations - */ -#include -#define _PR_HAVE_ATOMIC_OPS -#define _MD_INIT_ATOMIC() -#define _MD_ATOMIC_ADD(ptr,val) (__ATOMIC_ADD_LONG(ptr,val) + val) -#define _MD_ATOMIC_INCREMENT(val) (__ATOMIC_INCREMENT_LONG(val) + 1) -#define _MD_ATOMIC_DECREMENT(val) (__ATOMIC_DECREMENT_LONG(val) - 1) -#define _MD_ATOMIC_SET(val, newval) __ATOMIC_EXCH_LONG(val, newval) - -extern int thread_suspend(PRThread *thr_id); -extern int thread_resume(PRThread *thr_id); - -#endif /* nspr_openvms_defs_h___ */ diff --git a/nsprpub/pr/include/md/_pth.h b/nsprpub/pr/include/md/_pth.h index b44fd93af8d..46b27cc7275 100644 --- a/nsprpub/pr/include/md/_pth.h +++ b/nsprpub/pr/include/md/_pth.h @@ -146,7 +146,7 @@ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(HPUX) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ - || defined(VMS) || defined(NTO) || defined(DARWIN) \ + || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) #ifdef __GNU__ /* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */ @@ -203,12 +203,12 @@ #if (defined(AIX) && !defined(AIX4_3_PLUS)) \ || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ - || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \ + || defined(BSDI) || defined(UNIXWARE) \ || defined(DARWIN) || defined(SYMBIAN) #define PT_NO_SIGTIMEDWAIT #endif -#if defined(OSF1) || defined(VMS) +#if defined(OSF1) #define PT_PRIO_MIN PRI_OTHER_MIN #define PT_PRIO_MAX PRI_OTHER_MAX #elif defined(IRIX) @@ -274,7 +274,7 @@ */ #if defined(_PR_DCETHREADS) #define _PT_PTHREAD_YIELD() pthread_yield() -#elif defined(OSF1) || defined(VMS) +#elif defined(OSF1) /* * sched_yield can't be called from a signal handler. Must use * the _np version. diff --git a/nsprpub/pr/include/md/_unixos.h b/nsprpub/pr/include/md/_unixos.h index e0861f5acb5..bc31f42c41e 100644 --- a/nsprpub/pr/include/md/_unixos.h +++ b/nsprpub/pr/include/md/_unixos.h @@ -616,11 +616,7 @@ typedef PRInt64 _MDOff64_t; typedef PRIntn (*_MD_Fstat64)(PRIntn osfd, _MDStat64 *buf); typedef PRIntn (*_MD_Open64)(const char *path, int oflag, ...); -#if defined(VMS) -typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf, ...); -#else typedef PRIntn (*_MD_Stat64)(const char *path, _MDStat64 *buf); -#endif typedef _MDOff64_t (*_MD_Lseek64)(PRIntn osfd, _MDOff64_t, PRIntn whence); typedef void* (*_MD_Mmap64)( void *addr, PRSize len, PRIntn prot, PRIntn flags, diff --git a/nsprpub/pr/include/md/prosdep.h b/nsprpub/pr/include/md/prosdep.h index 59bb5fdd728..7e20ab4a69c 100644 --- a/nsprpub/pr/include/md/prosdep.h +++ b/nsprpub/pr/include/md/prosdep.h @@ -126,9 +126,6 @@ PR_BEGIN_EXTERN_C #elif defined(QNX) #include "md/_qnx.h" -#elif defined(VMS) -#include "md/_openvms.h" - #elif defined(NTO) #include "md/_nto.h" diff --git a/nsprpub/pr/include/obsolete/probslet.h b/nsprpub/pr/include/obsolete/probslet.h index 98bed4d59e2..bad5947429f 100644 --- a/nsprpub/pr/include/obsolete/probslet.h +++ b/nsprpub/pr/include/obsolete/probslet.h @@ -169,11 +169,7 @@ NSPR_API(PRInt32) PR_GetSysfdTableMax(void); NSPR_API(PRInt32) PR_SetSysfdTableSize(PRIntn table_size); #ifndef NO_NSPR_10_SUPPORT -#ifdef XP_MAC -#include -#else #include -#endif NSPR_API(PRInt32) PR_Stat(const char *path, struct stat *buf); #endif /* NO_NSPR_10_SUPPORT */ diff --git a/nsprpub/pr/include/obsolete/protypes.h b/nsprpub/pr/include/obsolete/protypes.h index 4405bfce2f0..ee64810be94 100644 --- a/nsprpub/pr/include/obsolete/protypes.h +++ b/nsprpub/pr/include/obsolete/protypes.h @@ -67,15 +67,6 @@ typedef PRIntn intn; #include #endif -/* - * OpenVMS defines all the int types below in its standard - * header files ints.h and types.h. - */ -#ifdef VMS -#include -#include -#endif - /* * SVR4 typedef of uint is commonly found on UNIX machines. * @@ -95,8 +86,7 @@ typedef PRIntn intn; * uint */ -#if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(XP_UNIX) || defined(NTO) +#if !defined(XP_BEOS) && !defined(XP_UNIX) || defined(NTO) typedef PRUintn uint; #endif @@ -104,7 +94,7 @@ typedef PRUintn uint; * uint64 */ -#if !defined(XP_BEOS) && !defined(VMS) +#if !defined(XP_BEOS) typedef PRUint64 uint64; #endif @@ -112,8 +102,8 @@ typedef PRUint64 uint64; * uint32 */ -#if !defined(XP_BEOS) && !defined(VMS) -#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) +#if !defined(XP_BEOS) +#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) typedef PRUint32 uint32; #else typedef unsigned long uint32; @@ -124,7 +114,7 @@ typedef unsigned long uint32; * uint16 */ -#if !defined(XP_BEOS) && !defined(VMS) +#if !defined(XP_BEOS) typedef PRUint16 uint16; #endif @@ -132,7 +122,7 @@ typedef PRUint16 uint16; * uint8 */ -#if !defined(XP_BEOS) && !defined(VMS) +#if !defined(XP_BEOS) typedef PRUint8 uint8; #endif @@ -140,8 +130,7 @@ typedef PRUint8 uint8; * int64 */ -#if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) +#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) typedef PRInt64 int64; #endif @@ -149,10 +138,9 @@ typedef PRInt64 int64; * int32 */ -#if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ +#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ && !defined(HPUX) -#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) +#if !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) typedef PRInt32 int32; #else typedef long int32; @@ -163,8 +151,7 @@ typedef long int32; * int16 */ -#if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ +#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ && !defined(HPUX) typedef PRInt16 int16; #endif @@ -173,8 +160,7 @@ typedef PRInt16 int16; * int8 */ -#if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ +#if !defined(XP_BEOS) && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ && !defined(HPUX) typedef PRInt8 int8; #endif @@ -240,13 +226,4 @@ typedef PRWord prword_t; #define PR_CompareStrings PL_CompareStrings #define PR_CompareValues PL_CompareValues -#if defined(XP_MAC) -#ifndef TRUE /* Mac standard is lower case true */ - #define TRUE 1 -#endif -#ifndef FALSE /* Mac standard is lower case false */ - #define FALSE 0 -#endif -#endif - #endif /* !defined(PROTYPES_H) */ diff --git a/nsprpub/pr/include/prenv.h b/nsprpub/pr/include/prenv.h index 2cae7d79eea..c73fffc75f3 100644 --- a/nsprpub/pr/include/prenv.h +++ b/nsprpub/pr/include/prenv.h @@ -145,13 +145,6 @@ NSPR_API(char*) PR_GetEnv(const char *var); */ NSPR_API(PRStatus) PR_SetEnv(const char *string); -/* -** DEPRECATED. Use PR_SetEnv() instead. -*/ -#ifdef XP_MAC -NSPR_API(PRIntn) PR_PutEnv(const char *string); -#endif - PR_END_EXTERN_C #endif /* prenv_h___ */ diff --git a/nsprpub/pr/include/prinet.h b/nsprpub/pr/include/prinet.h index 94e6a0228e6..7c3f4bd539c 100644 --- a/nsprpub/pr/include/prinet.h +++ b/nsprpub/pr/include/prinet.h @@ -42,8 +42,7 @@ * This file serves the following purposes: * - A cross-platform, "get-everything" socket header file. On * Unix, socket support is scattered in several header files, - * while Windows and Mac have a "get-everything" socket header - * file[2]. + * while Windows has a "get-everything" socket header file[2]. * - NSPR needs the following macro definitions and function * prototype declarations from these header files: * AF_INET diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h index b9b7edd43e6..63eb02de861 100644 --- a/nsprpub/pr/include/prinit.h +++ b/nsprpub/pr/include/prinit.h @@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.8 Beta" +#define PR_VERSION "4.8 Beta 1" #define PR_VMAJOR 4 #define PR_VMINOR 8 #define PR_VPATCH 0 diff --git a/nsprpub/pr/include/private/pprio.h b/nsprpub/pr/include/private/pprio.h index 61a454bc5e2..8f2965746a4 100644 --- a/nsprpub/pr/include/private/pprio.h +++ b/nsprpub/pr/include/private/pprio.h @@ -269,15 +269,6 @@ NSPR_API(PRStatus) PR_NT_CancelIo(PRFileDesc *fd); #endif /* WIN32 */ -/* -** Need external access to this on Mac so we can first set up our faux -** environment vars -*/ -#ifdef XP_MAC -NSPR_API(void) PR_Init_Log(void); -#endif - - PR_END_EXTERN_C #endif /* pprio_h___ */ diff --git a/nsprpub/pr/include/private/pprthred.h b/nsprpub/pr/include/private/pprthred.h index c94133965b4..fe8ae50159e 100644 --- a/nsprpub/pr/include/private/pprthred.h +++ b/nsprpub/pr/include/private/pprthred.h @@ -312,16 +312,6 @@ NSPR_API(PRIntn) PR_GetMonitorEntryCount(PRMonitor *mon); */ NSPR_API(PRMonitor*) PR_CTestAndEnterMonitor(void *address); -/*--------------------------------------------------------------------------- -** PLATFORM-SPECIFIC THREAD SYNCHRONIZATION FUNCTIONS ----------------------------------------------------------------------------*/ -#if defined(XP_MAC) - -NSPR_API(void) PR_Mac_WaitForAsyncNotify(PRIntervalTime timeout); -NSPR_API(void) PR_Mac_PostAsyncNotify(PRThread *thread); - -#endif /* XP_MAC */ - /*--------------------------------------------------------------------------- ** PLATFORM-SPECIFIC INITIALIZATION FUNCTIONS ---------------------------------------------------------------------------*/ diff --git a/nsprpub/pr/include/private/primpl.h b/nsprpub/pr/include/private/primpl.h index c0f4a3ab763..15971bceafa 100644 --- a/nsprpub/pr/include/private/primpl.h +++ b/nsprpub/pr/include/private/primpl.h @@ -73,13 +73,8 @@ typedef struct PRSegment PRSegment; -#ifdef XP_MAC -#include "prosdep.h" -#include "probslet.h" -#else #include "md/prosdep.h" #include "obsolete/probslet.h" -#endif /* XP_MAC */ #ifdef _PR_HAVE_POSIX_SEMAPHORES #include @@ -328,10 +323,8 @@ NSPR_API(PRInt32) _pr_intsOff; #define _MD_LAST_THREAD() (_pr_lastThread) #define _MD_SET_LAST_THREAD(t) (_pr_lastThread = t) -#ifndef XP_MAC #define _MD_GET_INTSOFF() (_pr_intsOff) #define _MD_SET_INTSOFF(_val) (_pr_intsOff = _val) -#endif /* The unbalanced curly braces in these two macros are intentional */ @@ -376,20 +369,12 @@ extern PRInt32 _native_threads_only; #else -#ifdef XP_MAC - -#define _PR_INTSOFF(_is) _MD_INTSOFF(_is) - -#else /* XP_MAC */ - #define _PR_INTSOFF(_is) \ PR_BEGIN_MACRO \ (_is) = _PR_MD_GET_INTSOFF(); \ _PR_MD_SET_INTSOFF(1); \ PR_END_MACRO -#endif /* XP_MAC */ - #define _PR_FAST_INTSON(_is) \ PR_BEGIN_MACRO \ _PR_MD_SET_INTSOFF(_is); \ @@ -1091,11 +1076,6 @@ extern PRStatus _PR_MD_DELETE_SEMAPHORE(const char *osname); extern void _PR_MD_INIT_FILEDESC(PRFileDesc *fd); #define _PR_MD_INIT_FILEDESC _MD_INIT_FILEDESC -#ifdef XP_MAC -extern void _PR_MD_FREE_FILEDESC(PRFileDesc *fd); -#define _PR_MD_FREE_FILEDESC _MD_FREE_FILEDESC -#endif - extern void _PR_MD_MAKE_NONBLOCK(PRFileDesc *fd); #define _PR_MD_MAKE_NONBLOCK _MD_MAKE_NONBLOCK diff --git a/nsprpub/pr/include/private/prpriv.h b/nsprpub/pr/include/private/prpriv.h index 780376e8e17..12a2cd6b6e3 100644 --- a/nsprpub/pr/include/private/prpriv.h +++ b/nsprpub/pr/include/private/prpriv.h @@ -42,12 +42,7 @@ * NSPR 2.0 Private API */ -#ifndef XP_MAC #include "private/pprio.h" #include "private/pprthred.h" -#else -#include "pprio.h" -#include "pprthred.h" -#endif #endif /* prpriv_h___ */ diff --git a/nsprpub/pr/include/prlink.h b/nsprpub/pr/include/prlink.h index f0cea829635..d15a271df24 100644 --- a/nsprpub/pr/include/prlink.h +++ b/nsprpub/pr/include/prlink.h @@ -107,13 +107,13 @@ NSPR_API(PRLibrary*) PR_LoadLibrary(const char *name); /* ** Each operating system has its preferred way of specifying ** a file in the file system. Most operating systems use -** a pathname. Mac OS, on the other hand, uses the FSSpec +** a pathname. Mac OS Classic, on the other hand, uses the FSSpec ** structure to specify a file. PRLibSpec allows NSPR clients ** to use the type of file specification that is most efficient ** for a particular platform. ** -** On some operating systems such as Mac OS, a shared library may -** contain code fragments that can be individually loaded. +** On some operating systems such as Mac OS Classic, a shared library +** may contain code fragments that can be individually loaded. ** PRLibSpec also allows NSPR clients to identify a code fragment ** in a library, if code fragments are supported by the OS. ** A code fragment can be specified by name or by an integer index. @@ -130,7 +130,7 @@ typedef enum PRLibSpecType { PR_LibSpec_PathnameU /* supported only on Win32 */ } PRLibSpecType; -struct FSSpec; /* Mac OS FSSpec */ +struct FSSpec; /* Mac OS Classic FSSpec */ typedef struct PRLibSpec { PRLibSpecType type; diff --git a/nsprpub/pr/include/prtypes.h b/nsprpub/pr/include/prtypes.h index 2d963f14384..dd66d0f5950 100644 --- a/nsprpub/pr/include/prtypes.h +++ b/nsprpub/pr/include/prtypes.h @@ -112,22 +112,6 @@ #define PR_CALLBACK_DECL #define PR_STATIC_CALLBACK(__x) static __x -#elif defined(XP_MAC) - -#define PR_EXPORT(__type) extern __declspec(export) __type -#define PR_EXPORT_DATA(__type) extern __declspec(export) __type -#define PR_IMPORT(__type) extern __declspec(export) __type -#define PR_IMPORT_DATA(__type) extern __declspec(export) __type - -#define PR_EXTERN(__type) extern __declspec(export) __type -#define PR_IMPLEMENT(__type) __declspec(export) __type -#define PR_EXTERN_DATA(__type) extern __declspec(export) __type -#define PR_IMPLEMENT_DATA(__type) __declspec(export) __type - -#define PR_CALLBACK -#define PR_CALLBACK_DECL -#define PR_STATIC_CALLBACK(__x) static __x - #elif defined(XP_OS2) && defined(__declspec) #define PR_EXPORT(__type) extern __declspec(dllexport) __type @@ -468,7 +452,7 @@ typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus; #ifndef __PRUNICHAR__ #define __PRUNICHAR__ -#if defined(WIN32) || defined(XP_MAC) +#ifdef WIN32 typedef wchar_t PRUnichar; #else typedef PRUint16 PRUnichar; @@ -530,11 +514,7 @@ typedef unsigned long PRUword; #define NSPR_END_EXTERN_C #endif -#ifdef XP_MAC -#include "protypes.h" -#else #include "obsolete/protypes.h" -#endif /********* ????????????? End Fix me ?????????????????????????????? *****/ #endif /* NO_NSPR_10_SUPPORT */ diff --git a/nsprpub/pr/src/io/prfile.c b/nsprpub/pr/src/io/prfile.c index 6545a48a4ad..00dbb89d0af 100644 --- a/nsprpub/pr/src/io/prfile.c +++ b/nsprpub/pr/src/io/prfile.c @@ -132,9 +132,6 @@ static PROffset32 PR_CALLBACK FileSeek(PRFileDesc *fd, PROffset32 offset, PRSeek static PROffset64 PR_CALLBACK FileSeek64(PRFileDesc *fd, PROffset64 offset, PRSeekWhence whence) { -#ifdef XP_MAC -#pragma unused( fd, offset, whence ) -#endif PROffset64 result; result = _PR_MD_LSEEK64(fd, offset, whence); @@ -162,9 +159,6 @@ static PRInt32 PR_CALLBACK FileAvailable(PRFileDesc *fd) static PRInt64 PR_CALLBACK FileAvailable64(PRFileDesc *fd) { -#ifdef XP_MAC -#pragma unused( fd ) -#endif PRInt64 result, cur, end; PRInt64 minus_one; @@ -198,10 +192,6 @@ static PRInt64 PR_CALLBACK PipeAvailable64(PRFileDesc *fd) static PRStatus PR_CALLBACK PipeSync(PRFileDesc *fd) { -#if defined(XP_MAC) -#pragma unused (fd) -#endif - return PR_SUCCESS; } @@ -218,9 +208,6 @@ static PRStatus PR_CALLBACK FileGetInfo(PRFileDesc *fd, PRFileInfo *info) static PRStatus PR_CALLBACK FileGetInfo64(PRFileDesc *fd, PRFileInfo64 *info) { -#ifdef XP_MAC -#pragma unused( fd, info ) -#endif /* $$$$ NOT YET IMPLEMENTED */ PRInt32 rv; @@ -261,9 +248,6 @@ static PRStatus PR_CALLBACK FileClose(PRFileDesc *fd) static PRInt16 PR_CALLBACK FilePoll( PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags) { -#ifdef XP_MAC -#pragma unused( fd, in_flags ) -#endif *out_flags = 0; return in_flags; } /* FilePoll */ @@ -436,7 +420,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) ULONG ulCurMaxFH = 0; DosSetRelMaxFH(&ulReqCount, &ulCurMaxFH); return ulCurMaxFH; -#elif defined (XP_MAC) || defined(XP_BEOS) +#elif defined(XP_BEOS) PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return -1; #else @@ -485,10 +469,6 @@ PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size) || defined(WIN32) || defined(WIN16) || defined(XP_BEOS) PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return -1; -#elif defined (XP_MAC) -#pragma unused (table_size) - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return -1; #else write me; #endif @@ -518,9 +498,6 @@ PR_IMPLEMENT(PRStatus) PR_GetFileInfo(const char *fn, PRFileInfo *info) PR_IMPLEMENT(PRStatus) PR_GetFileInfo64(const char *fn, PRFileInfo64 *info) { -#ifdef XP_MAC -#pragma unused (fn, info) -#endif PRInt32 rv; if (!_pr_initialized) _PR_ImplicitInitialization(); @@ -715,10 +692,6 @@ PR_IMPLEMENT(PRStatus) PR_CreatePipe( PRFileDesc **writePipe ) { -#if defined(XP_MAC) -#pragma unused (readPipe, writePipe) -#endif - #if defined(WIN32) && !defined(WINCE) HANDLE readEnd, writeEnd; SECURITY_ATTRIBUTES pipeAttributes; @@ -827,9 +800,6 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFileUTF16( PR_IMPLEMENT(PRStatus) PR_GetFileInfo64UTF16(const PRUnichar *fn, PRFileInfo64 *info) { -#ifdef XP_MAC -#pragma unused (fn, info) -#endif PRInt32 rv; if (!_pr_initialized) _PR_ImplicitInitialization(); diff --git a/nsprpub/pr/src/io/prio.c b/nsprpub/pr/src/io/prio.c index 7426b7233f9..b779b1c05af 100644 --- a/nsprpub/pr/src/io/prio.c +++ b/nsprpub/pr/src/io/prio.c @@ -162,9 +162,6 @@ PR_IMPLEMENT(PRFileDesc*) PR_AllocFileDesc( PR_IMPLEMENT(void) PR_FreeFileDesc(PRFileDesc *fd) { PR_ASSERT(fd); -#ifdef XP_MAC - _PR_MD_FREE_FILEDESC(fd); -#endif _PR_Putfd(fd); } @@ -200,9 +197,6 @@ PR_IMPLEMENT(PRStatus) PR_SetFDInheritable( } return PR_SUCCESS; #else -#ifdef XP_MAC -#pragma unused (fd, inheritable) -#endif PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; #endif diff --git a/nsprpub/pr/src/io/prlog.c b/nsprpub/pr/src/io/prlog.c index 0d6bfd159b1..6ec92f0e105 100644 --- a/nsprpub/pr/src/io/prlog.c +++ b/nsprpub/pr/src/io/prlog.c @@ -128,8 +128,6 @@ static void OutputDebugStringA(const char* msg) { #define _PUT_LOG(fd, buf, nb) {fwrite(buf, 1, nb, fd); fflush(fd);} #elif defined(_PR_PTHREADS) #define _PUT_LOG(fd, buf, nb) PR_Write(fd, buf, nb) -#elif defined(XP_MAC) -#define _PUT_LOG(fd, buf, nb) _PR_MD_WRITE_SYNC(fd, buf, nb) #else #define _PUT_LOG(fd, buf, nb) _PR_MD_WRITE(fd, buf, nb) #endif @@ -146,6 +144,7 @@ static FILE *logFile = NULL; #else static PRFileDesc *logFile = 0; #endif +static PRBool outputTimeStamp = PR_FALSE; #define LINE_BUF_SIZE 512 #define DEFAULT_BUF_SIZE 16384 @@ -231,6 +230,8 @@ void _PR_InitLog(void) if (level >= LINE_BUF_SIZE) { bufSize = level; } + } else if (strcasecmp(module, "__timestamp") == 0) { + outputTimeStamp = PR_TRUE; } else { PRLogModuleInfo *lm = logModules; PRBool skip_modcheck = @@ -296,14 +297,13 @@ void _PR_LogCleanup(void) #endif ) { fclose(logFile); - logFile = NULL; } #else if (logFile && logFile != _pr_stdout && logFile != _pr_stderr) { PR_Close(logFile); - logFile = NULL; } #endif + logFile = NULL; if (logBuf) PR_DELETE(logBuf); @@ -419,9 +419,6 @@ PR_IMPLEMENT(PRBool) PR_SetLogFile(const char *file) PR_Close(logFile); } logFile = newLogFile; -#if defined(XP_MAC) - SetLogFileTypeCreator(file); -#endif } return (PRBool) (newLogFile != 0); #endif /* _PR_USE_STDIO_FOR_LOGGING */ @@ -445,8 +442,9 @@ PR_IMPLEMENT(void) PR_LogPrint(const char *fmt, ...) va_list ap; char line[LINE_BUF_SIZE]; char *line_long = NULL; - PRUint32 nb_tid, nb; + PRUint32 nb_tid = 0, nb; PRThread *me; + PRExplodedTime now; if (!_pr_initialized) _PR_ImplicitInitialization(); @@ -454,17 +452,18 @@ PR_IMPLEMENT(void) PR_LogPrint(const char *fmt, ...) return; } + if (outputTimeStamp) { + PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); + nb_tid = PR_FormatTimeUSEnglish(line, sizeof(line)-1, + "%Y-%m-%d %H:%M:%S - ", &now); + } + me = PR_GetCurrentThread(); - nb_tid = PR_snprintf(line, sizeof(line)-1, "%ld[%p]: ", -#if defined(_PR_DCETHREADS) - /* The problem is that for _PR_DCETHREADS, pthread_t is not a - * pointer, but a structure; so you can't easily print it... - */ - me ? &(me->id): 0L, me); -#elif defined(_PR_BTHREADS) - me, me); + nb_tid += PR_snprintf(line+nb_tid, sizeof(line)-nb_tid-1, "%ld[%p]: ", +#if defined(_PR_BTHREADS) + me, me); #else - me ? me->id : 0L, me); + me ? me->id : 0L, me); #endif va_start(ap, fmt); @@ -489,7 +488,10 @@ PR_IMPLEMENT(void) PR_LogPrint(const char *fmt, ...) _PUT_LOG(logFile, logBuf, logp - logBuf); logp = logBuf; } - /* Write out the thread id and the malloc'ed buffer. */ + /* + * Write out the thread id (with an optional timestamp) and the + * malloc'ed buffer. + */ _PUT_LOG(logFile, line, nb_tid); _PUT_LOG(logFile, line_long, nb); /* Ensure there is a trailing newline. */ @@ -549,23 +551,11 @@ PR_IMPLEMENT(void) PR_Assert(const char *s, const char *file, PRIntn ln) #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) fprintf(stderr, "Assertion failure: %s, at %s:%d\n", s, file, ln); #endif -#ifdef XP_MAC - dprintf("Assertion failure: %s, at %s:%d\n", s, file, ln); -#endif #ifdef WIN32 DebugBreak(); #endif #ifdef XP_OS2 asm("int $3"); #endif -#ifndef XP_MAC abort(); -#endif } - -#ifdef XP_MAC -PR_IMPLEMENT(void) PR_Init_Log(void) -{ - _PR_InitLog(); -} -#endif diff --git a/nsprpub/pr/src/io/prmapopt.c b/nsprpub/pr/src/io/prmapopt.c index 8379b23a50e..04501b024ed 100644 --- a/nsprpub/pr/src/io/prmapopt.c +++ b/nsprpub/pr/src/io/prmapopt.c @@ -368,28 +368,6 @@ PRStatus PR_CALLBACK _PR_SocketSetSocketOption(PRFileDesc *fd, const PRSocketOpt ********************************************************************* */ -#if defined(VMS) -/* -** Sad but true. The DEC C header files define the following socket options -** differently to what UCX is expecting. The values that UCX expects are -** defined in SYS$LIBRARY:UCX$INETDEF.H. We redefine them here to the values -** that UCX expects. Note that UCX V4.x will only accept these values while -** UCX V5.x will accept either. So in theory this hack can be removed once -** UCX V5 is the minimum. -*/ -#undef IP_MULTICAST_IF -#undef IP_MULTICAST_TTL -#undef IP_MULTICAST_LOOP -#undef IP_ADD_MEMBERSHIP -#undef IP_DROP_MEMBERSHIP -#include -#define IP_MULTICAST_IF UCX$C_IP_MULTICAST_IF -#define IP_MULTICAST_TTL UCX$C_IP_MULTICAST_TTL -#define IP_MULTICAST_LOOP UCX$C_IP_MULTICAST_LOOP -#define IP_ADD_MEMBERSHIP UCX$C_IP_ADD_MEMBERSHIP -#define IP_DROP_MEMBERSHIP UCX$C_IP_DROP_MEMBERSHIP -#endif - /* * Not every platform has all the socket options we want to * support. Some older operating systems such as SunOS 4.1.3 diff --git a/nsprpub/pr/src/io/prmwait.c b/nsprpub/pr/src/io/prmwait.c index 6b3c46a34b1..5b30f694dd7 100644 --- a/nsprpub/pr/src/io/prmwait.c +++ b/nsprpub/pr/src/io/prmwait.c @@ -1275,9 +1275,6 @@ invalid_arg: PR_IMPLEMENT(PRWaitGroup*) PR_CreateWaitGroup(PRInt32 size /* ignored */) { -#ifdef XP_MAC -#pragma unused (size) -#endif PRWaitGroup *wg; if (NULL == (wg = PR_NEWZAP(PRWaitGroup))) diff --git a/nsprpub/pr/src/io/prpolevt.c b/nsprpub/pr/src/io/prpolevt.c index 733b0fcbd35..f94190d883c 100644 --- a/nsprpub/pr/src/io/prpolevt.c +++ b/nsprpub/pr/src/io/prpolevt.c @@ -58,85 +58,6 @@ #include "prerror.h" #include "prlog.h" -#ifdef VMS - -/* - * On OpenVMS we use an event flag instead of a pipe or a socket since - * event flags are much more efficient on OpenVMS. - */ -#include "pprio.h" -#include -#include -#include - -PR_IMPLEMENT(PRFileDesc *) PR_NewPollableEvent(void) -{ - unsigned int status; - int flag = -1; - PRFileDesc *event; - - /* - ** Allocate an event flag and clear it. - */ - status = lib$get_ef(&flag); - if ((!$VMS_STATUS_SUCCESS(status)) || (flag == -1)) { - PR_SetError(PR_INSUFFICIENT_RESOURCES_ERROR, status); - return NULL; - } - sys$clref(flag); - - /* - ** Give NSPR the event flag's negative value. We do this because our - ** select interprets a negative fd as an event flag rather than a - ** regular file fd. - */ - event = PR_CreateSocketPollFd(-flag); - if (NULL == event) { - lib$free_ef(&flag); - return NULL; - } - - return event; -} - -PR_IMPLEMENT(PRStatus) PR_DestroyPollableEvent(PRFileDesc *event) -{ - int flag = -PR_FileDesc2NativeHandle(event); - PR_DestroySocketPollFd(event); - lib$free_ef(&flag); - return PR_SUCCESS; -} - -PR_IMPLEMENT(PRStatus) PR_SetPollableEvent(PRFileDesc *event) -{ - /* - ** Just set the event flag. - */ - unsigned int status; - status = sys$setef(-PR_FileDesc2NativeHandle(event)); - if (!$VMS_STATUS_SUCCESS(status)) { - PR_SetError(PR_INVALID_ARGUMENT_ERROR, status); - return PR_FAILURE; - } - return PR_SUCCESS; -} - -PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event) -{ - /* - ** Just clear the event flag. - */ - unsigned int status; - status = sys$clref(-PR_FileDesc2NativeHandle(event)); - if (!$VMS_STATUS_SUCCESS(status)) { - PR_SetError(PR_INVALID_ARGUMENT_ERROR, status); - return PR_FAILURE; - } - return PR_SUCCESS; -} - -#else /* VMS */ - /* * These internal functions are declared in primpl.h, * but we can't include primpl.h because the definition @@ -339,5 +260,3 @@ PR_IMPLEMENT(PRStatus) PR_WaitForPollableEvent(PRFileDesc *event) return PR_SUCCESS; } - -#endif /* VMS */ diff --git a/nsprpub/pr/src/io/prsocket.c b/nsprpub/pr/src/io/prsocket.c index 1eae6d66611..8b4ef269956 100644 --- a/nsprpub/pr/src/io/prsocket.c +++ b/nsprpub/pr/src/io/prsocket.c @@ -355,14 +355,6 @@ static PRStatus PR_CALLBACK SocketConnectContinue( } return PR_SUCCESS; -#elif defined(XP_MAC) - - err = _MD_mac_get_nonblocking_connect_error(fd); - if (err == -1) - return PR_FAILURE; - else - return PR_SUCCESS; - #elif defined(XP_BEOS) #ifdef BONE_VERSION /* bug 122364 */ @@ -765,10 +757,6 @@ static PRInt64 PR_CALLBACK SocketAvailable64(PRFileDesc *fd) static PRStatus PR_CALLBACK SocketSync(PRFileDesc *fd) { -#if defined(XP_MAC) -#pragma unused (fd) -#endif - return PR_SUCCESS; } @@ -1117,9 +1105,6 @@ static PRStatus PR_CALLBACK SocketGetPeerName(PRFileDesc *fd, PRNetAddr *addr) static PRInt16 PR_CALLBACK SocketPoll( PRFileDesc *fd, PRInt16 in_flags, PRInt16 *out_flags) { -#ifdef XP_MAC -#pragma unused( fd, in_flags ) -#endif *out_flags = 0; return in_flags; } /* SocketPoll */ @@ -1684,11 +1669,7 @@ PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PROsfd fd, PR_fd_set *set) #if !defined(NEED_SELECT) -#if !defined(XP_MAC) #include "obsolete/probslet.h" -#else -#include "probslet.h" -#endif #define PD_INCR 20 diff --git a/nsprpub/pr/src/linking/prlink.c b/nsprpub/pr/src/linking/prlink.c index 72796eab67f..0f976e0e8c5 100644 --- a/nsprpub/pr/src/linking/prlink.c +++ b/nsprpub/pr/src/linking/prlink.c @@ -88,70 +88,6 @@ #define _PR_DEFAULT_LD_FLAGS PR_LD_LAZY -#ifdef VMS -/* These are all require for the PR_GetLibraryFilePathname implementation */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#pragma __nostandard -#pragma __member_alignment __save -#pragma __nomember_alignment -#ifdef __INITIAL_POINTER_SIZE -#pragma __required_pointer_size __save -#pragma __required_pointer_size __short -#endif - -typedef struct _imcb { - struct _imcb *imcb$l_flink; - struct _imcb *imcb$l_blink; - unsigned short int imcb$w_size; - unsigned char imcb$b_type; - char imcb$b_resv_1; - unsigned char imcb$b_access_mode; - unsigned char imcb$b_act_code; - unsigned short int imcb$w_chan; - unsigned int imcb$l_flags; - char imcb$t_image_name [40]; - unsigned int imcb$l_symvec_size; - unsigned __int64 imcb$q_ident; - void *imcb$l_starting_address; - void *imcb$l_end_address; -} IMCB; - -#pragma __member_alignment __restore -#ifdef __INITIAL_POINTER_SIZE -#pragma __required_pointer_size __restore -#endif -#pragma __standard - -typedef struct { - short buflen; - short itmcode; - void *buffer; - void *retlen; -} ITMLST; - -typedef struct { - short cond; - short count; - int rest; -} IOSB; - -typedef unsigned long int ulong_t; - -struct _imcb *IAC$GL_IMAGE_LIST = NULL; - -#define MAX_DEVNAM 64 -#define MAX_FILNAM 255 -#endif /* VMS */ - /* * On these platforms, symbols have a leading '_'. */ @@ -1587,96 +1523,6 @@ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr) } PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0); return NULL; -#elif defined(VMS) - /* Contributed by Colin Blake of HP */ - struct _imcb *icb; - ulong_t status; - char device_name[MAX_DEVNAM]; - int device_name_len; - $DESCRIPTOR (device_name_desc, device_name); - struct fibdef fib; - struct dsc$descriptor_s fib_desc = - { sizeof(struct fibdef), DSC$K_DTYPE_Z, DSC$K_CLASS_S, (char *)&fib } ; - IOSB iosb; - ITMLST devlst[2] = { - {MAX_DEVNAM, DVI$_ALLDEVNAM, device_name, &device_name_len}, - {0,0,0,0}}; - short file_name_len; - char file_name[MAX_FILNAM+1]; - char *result = NULL; - struct dsc$descriptor_s file_name_desc = - { MAX_FILNAM, DSC$K_DTYPE_T, DSC$K_CLASS_S, (char *) &file_name[0] } ; - - /* - ** The address for the process image list could change in future versions - ** of the operating system. 7FFD0688 is valid for V7.2 and V7.3 releases, - ** so we use that for the default, but allow an environment variable - ** (logical name) to override. - */ - if (IAC$GL_IMAGE_LIST == NULL) { - char *p = getenv("MOZILLA_IAC_GL_IMAGE_LIST"); - if (p) - IAC$GL_IMAGE_LIST = (struct _imcb *) strtol(p,NULL,0); - else - IAC$GL_IMAGE_LIST = (struct _imcb *) 0x7FFD0688; - } - - for (icb = IAC$GL_IMAGE_LIST->imcb$l_flink; - icb != IAC$GL_IMAGE_LIST; - icb = icb->imcb$l_flink) { - if (((void *)addr >= icb->imcb$l_starting_address) && - ((void *)addr <= icb->imcb$l_end_address)) { - /* - ** This is the correct image. - ** Get the device name. - */ - status = sys$getdviw(0,icb->imcb$w_chan,0,&devlst,0,0,0,0); - if ($VMS_STATUS_SUCCESS(status)) - device_name_desc.dsc$w_length = device_name_len; - - /* - ** Get the FID. - */ - memset(&fib,0,sizeof(struct fibdef)); - status = sys$qiow(0,icb->imcb$w_chan,IO$_ACCESS,&iosb, - 0,0,&fib_desc,0,0,0,0,0); - - /* - ** If we got the FID, now look up its name (if for some reason - ** we didn't get the device name, this call will fail). - */ - if (($VMS_STATUS_SUCCESS(status)) && ($VMS_STATUS_SUCCESS(iosb.cond))) { - status = lib$fid_to_name ( - &device_name_desc, - &fib.fib$w_fid, - &file_name_desc, - &file_name_len, - 0, 0); - - /* - ** If we succeeded then remove the version number and - ** return a copy of the UNIX format version of the file name. - */ - if ($VMS_STATUS_SUCCESS(status)) { - char *p, *result; - file_name[file_name_len] = 0; - p = strrchr(file_name,';'); - if (p) *p = 0; - p = decc$translate_vms(&file_name[0]); - result = PR_Malloc(strlen(p)+1); - if (result != NULL) { - strcpy(result, p); - } - return result; - } - } - } - } - - /* Didn't find it */ - PR_SetError(PR_LIBRARY_NOT_LOADED_ERROR, 0); - return NULL; - #elif defined(HPUX) && defined(USE_HPSHL) int index; struct shl_descriptor desc; diff --git a/nsprpub/pr/src/md/prosdep.c b/nsprpub/pr/src/md/prosdep.c index 9130c2398d0..d80256a41df 100644 --- a/nsprpub/pr/src/md/prosdep.c +++ b/nsprpub/pr/src/md/prosdep.c @@ -76,10 +76,6 @@ static void GetPageSize(void) #endif #endif /* XP_UNIX */ -#ifdef XP_MAC - _pr_pageSize = 4096; -#endif /* XP_MAC */ - #ifdef XP_BEOS _pr_pageSize = B_PAGE_SIZE; #endif diff --git a/nsprpub/pr/src/md/unix/openvms.c b/nsprpub/pr/src/md/unix/openvms.c deleted file mode 100644 index 20b4f70880e..00000000000 --- a/nsprpub/pr/src/md/unix/openvms.c +++ /dev/null @@ -1,286 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Netscape Portable Runtime (NSPR). - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * 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 - * 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. - * - * ***** END LICENSE BLOCK ***** */ - -#include "primpl.h" - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ -#ifndef _PR_PTHREADS - if (isCurrent) { - (void) setjmp(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -#else - *np = 0; - return NULL; -#endif -} - -#ifndef _PR_PTHREADS -void -_MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri) -{ - return; -} - -PRStatus -_MD_InitializeThread(PRThread *thread) -{ - return PR_SUCCESS; -} - -PRStatus -_MD_WAIT(PRThread *thread, PRIntervalTime ticks) -{ - PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); - _PR_MD_SWITCH_CONTEXT(thread); - return PR_SUCCESS; -} - -PRStatus -_MD_WAKEUP_WAITER(PRThread *thread) -{ - if (thread) { - PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); - } - return PR_SUCCESS; -} - -/* These functions should not be called for OSF1 */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for OSF1."); -} - -PRStatus -_MD_CREATE_THREAD( - PRThread *thread, - void (*start) (void *), - PRThreadPriority priority, - PRThreadScope scope, - PRThreadState state, - PRUint32 stackSize) -{ - PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1."); - return PR_FAILURE; -} -#endif /* ! _PR_PTHREADS */ - -#ifdef _PR_HAVE_ATOMIC_CAS - -#include - -#define _PR_OSF_ATOMIC_LOCK 1 - -void -PR_StackPush(PRStack *stack, PRStackElem *stack_elem) -{ -long locked; - - do { - while ((long) stack->prstk_head.prstk_elem_next == - _PR_OSF_ATOMIC_LOCK) - ; - locked = __ATOMIC_EXCH_QUAD(&stack->prstk_head.prstk_elem_next, - _PR_OSF_ATOMIC_LOCK); - - } while (locked == _PR_OSF_ATOMIC_LOCK); - stack_elem->prstk_elem_next = (PRStackElem *) locked; - /* - * memory-barrier instruction - */ - asm("mb"); - stack->prstk_head.prstk_elem_next = stack_elem; -} - -PRStackElem * -PR_StackPop(PRStack *stack) -{ -PRStackElem *element; -long locked; - - do { - while ((long)stack->prstk_head.prstk_elem_next == _PR_OSF_ATOMIC_LOCK) - ; - locked = __ATOMIC_EXCH_QUAD(&stack->prstk_head.prstk_elem_next, - _PR_OSF_ATOMIC_LOCK); - - } while (locked == _PR_OSF_ATOMIC_LOCK); - - element = (PRStackElem *) locked; - - if (element == NULL) { - stack->prstk_head.prstk_elem_next = NULL; - } else { - stack->prstk_head.prstk_elem_next = - element->prstk_elem_next; - } - /* - * memory-barrier instruction - */ - asm("mb"); - return element; -} -#endif /* _PR_HAVE_ATOMIC_CAS */ - - -/* -** thread_suspend and thread_resume are used by the gc code -** in nsprpub/pr/src/pthreads/ptthread.c -** -** These routines are never called for the current thread, and -** there is no check for that - so beware! -*/ -int thread_suspend(PRThread *thr_id) { - - extern int pthread_suspend_np ( - pthread_t thread, - __pthreadLongUint_t *regs, - void *spare); - - __pthreadLongUint_t regs[34]; - int res; - - /* - ** A return res < 0 indicates that the thread was suspended - ** but register information could not be obtained - */ - - res = pthread_suspend_np(thr_id->id,®s[0],0); - if (res==0) - thr_id->sp = (void *) regs[30]; - - thr_id->suspend |= PT_THREAD_SUSPENDED; - - /* Always succeeds */ - return 0; -} - -int thread_resume(PRThread *thr_id) { - extern int pthread_resume_np(pthread_t thread); - int res; - - res = pthread_resume_np (thr_id->id); - - thr_id->suspend |= PT_THREAD_RESUMED; - - return 0; -} - -/* -** Stubs for nspr_symvec.opt -** -** PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended -** (defined in ptthread.c) used to be exported by mistake -** (because they look like public functions). They have been -** converted into static functions. -** -** There is an existing third-party binary that uses NSPR: the -** Java plugin for Mozilla. Because it is part of the Java -** SDK, we have no control over its releases. So we need these -** stub functions to occupy the slots that used to be occupied -** by PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended -** in the symbol vector so that LIBNSPR4 is backward compatible. -** -** The Java plugin was also using PR_CreateThread which we didn't -** realise and hadn't "nailed down". So we now need to nail it down -** to its Mozilla 1.1 position and have to insert 51 additional stubs -** in order to achive this (stubs 4-54). -** -** Over time some of these stubs will get reused by new symbols. -** - Stub54 is replaced by LL_MaxUint -*/ - -void PR_VMS_Stub1(void) { } -void PR_VMS_Stub2(void) { } -void PR_VMS_Stub3(void) { } -void PR_VMS_Stub4(void) { } -void PR_VMS_Stub5(void) { } -void PR_VMS_Stub6(void) { } -void PR_VMS_Stub7(void) { } -void PR_VMS_Stub8(void) { } -void PR_VMS_Stub9(void) { } -void PR_VMS_Stub10(void) { } -void PR_VMS_Stub11(void) { } -void PR_VMS_Stub12(void) { } -void PR_VMS_Stub13(void) { } -void PR_VMS_Stub14(void) { } -void PR_VMS_Stub15(void) { } -void PR_VMS_Stub16(void) { } -void PR_VMS_Stub17(void) { } -void PR_VMS_Stub18(void) { } -void PR_VMS_Stub19(void) { } -void PR_VMS_Stub20(void) { } -void PR_VMS_Stub21(void) { } -void PR_VMS_Stub22(void) { } -void PR_VMS_Stub23(void) { } -void PR_VMS_Stub24(void) { } -void PR_VMS_Stub25(void) { } -void PR_VMS_Stub26(void) { } -void PR_VMS_Stub27(void) { } -void PR_VMS_Stub28(void) { } -void PR_VMS_Stub29(void) { } -void PR_VMS_Stub30(void) { } -void PR_VMS_Stub31(void) { } -void PR_VMS_Stub32(void) { } -void PR_VMS_Stub33(void) { } -void PR_VMS_Stub34(void) { } -void PR_VMS_Stub35(void) { } -void PR_VMS_Stub36(void) { } -void PR_VMS_Stub37(void) { } -void PR_VMS_Stub38(void) { } -void PR_VMS_Stub39(void) { } -void PR_VMS_Stub40(void) { } -void PR_VMS_Stub41(void) { } -void PR_VMS_Stub42(void) { } -void PR_VMS_Stub43(void) { } -void PR_VMS_Stub44(void) { } -void PR_VMS_Stub45(void) { } -void PR_VMS_Stub46(void) { } -void PR_VMS_Stub47(void) { } -void PR_VMS_Stub48(void) { } -void PR_VMS_Stub49(void) { } -void PR_VMS_Stub50(void) { } -void PR_VMS_Stub51(void) { } -void PR_VMS_Stub52(void) { } -void PR_VMS_Stub53(void) { } diff --git a/nsprpub/pr/src/md/unix/uxproces.c b/nsprpub/pr/src/md/unix/uxproces.c index 9f7cd9a5b0a..364301c8d53 100644 --- a/nsprpub/pr/src/md/unix/uxproces.c +++ b/nsprpub/pr/src/md/unix/uxproces.c @@ -60,10 +60,6 @@ PR_IMPORT_DATA(char **) environ; #define SA_RESTART 0 #endif -#if defined(VMS) -static PRLock *_pr_vms_fork_lock = NULL; -#endif - /* ********************************************************************** * @@ -176,9 +172,6 @@ ForkAndExec( char *const *childEnvp; char **newEnvp = NULL; int flags; -#ifdef VMS - char VMScurdir[FILENAME_MAX+1] = { '\0' } ; -#endif process = PR_NEW(PRProcess); if (!process) { @@ -219,66 +212,6 @@ ForkAndExec( childEnvp = newEnvp; } -#ifdef VMS -/* -** Since vfork/exec is implemented VERY differently on OpenVMS, we have to -** handle the setting up of the standard streams very differently. And since -** none of this code can ever execute in the context of the child, we have -** to perform the chdir in the parent so the child is born into the correct -** directory (and then switch the parent back again). -*/ -{ - int decc$set_child_standard_streams(int,int,int); - int n, fd_stdin=0, fd_stdout=1, fd_stderr=2; - - /* Set up any standard streams we are given, assuming defaults */ - if (attr) { - if (attr->stdinFd) - fd_stdin = attr->stdinFd->secret->md.osfd; - if (attr->stdoutFd) - fd_stdout = attr->stdoutFd->secret->md.osfd; - if (attr->stderrFd) - fd_stderr = attr->stderrFd->secret->md.osfd; - } - - /* - ** Put a lock around anything that isn't going to be thread-safe. - */ - PR_Lock(_pr_vms_fork_lock); - - /* - ** Prepare the child's streams. We always do this in case a previous fork - ** has left the stream assignments in some non-standard way. - */ - n = decc$set_child_standard_streams(fd_stdin,fd_stdout,fd_stderr); - if (n == -1) { - PR_SetError(PR_BAD_DESCRIPTOR_ERROR, errno); - PR_DELETE(process); - if (newEnvp) { - PR_DELETE(newEnvp); - } - PR_Unlock(_pr_vms_fork_lock); - return NULL; - } - - /* Switch directory if we have to */ - if (attr) { - if (attr->currentDirectory) { - if ( (getcwd(VMScurdir,sizeof(VMScurdir)) == NULL) || - (chdir(attr->currentDirectory) < 0) ) { - PR_SetError(PR_DIRECTORY_OPEN_ERROR, errno); - PR_DELETE(process); - if (newEnvp) { - PR_DELETE(newEnvp); - } - PR_Unlock(_pr_vms_fork_lock); - return NULL; - } - } - } -} -#endif /* VMS */ - #ifdef AIX process->md.pid = (*pr_wp.forkptr)(); #elif defined(NTO) || defined(SYMBIAN) @@ -345,9 +278,6 @@ ForkAndExec( */ #if !defined(NTO) && !defined(SYMBIAN) -#ifdef VMS - /* OpenVMS has already handled all this above */ -#else if (attr) { /* the osfd's to redirect stdin, stdout, and stderr to */ int in_osfd = -1, out_osfd = -1, err_osfd = -1; @@ -401,7 +331,6 @@ ForkAndExec( } } } -#endif /* !VMS */ if (childEnvp) { (void)execve(path, argv, childEnvp); @@ -410,36 +339,13 @@ ForkAndExec( (void)execv(path, argv); } /* Whoops! It returned. That's a bad sign. */ -#ifdef VMS - /* - ** On OpenVMS we are still in the context of the parent, and so we - ** can (and should!) perform normal error handling. - */ - PR_SetError(PR_UNKNOWN_ERROR, errno); - PR_DELETE(process); - if (newEnvp) { - PR_DELETE(newEnvp); - } - if (VMScurdir[0] != '\0') - chdir(VMScurdir); - PR_Unlock(_pr_vms_fork_lock); - return NULL; -#else _exit(1); -#endif /* VMS */ #endif /* !NTO */ } if (newEnvp) { PR_DELETE(newEnvp); } -#ifdef VMS - /* If we switched directories, then remember to switch back */ - if (VMScurdir[0] != '\0') { - chdir(VMScurdir); /* can't do much if it fails */ - } - PR_Unlock(_pr_vms_fork_lock); -#endif /* VMS */ #if defined(_PR_NATIVE_THREADS) PR_Lock(pr_wp.ml); @@ -847,11 +753,6 @@ static PRStatus _MD_InitProcesses(void) pr_wp.ml = PR_NewLock(); PR_ASSERT(NULL != pr_wp.ml); -#if defined(VMS) - _pr_vms_fork_lock = PR_NewLock(); - PR_ASSERT(NULL != _pr_vms_fork_lock); -#endif - #if defined(_PR_NATIVE_THREADS) pr_wp.numProcs = 0; pr_wp.cv = PR_NewCondVar(pr_wp.ml); diff --git a/nsprpub/pr/src/md/unix/uxrng.c b/nsprpub/pr/src/md/unix/uxrng.c index 86f0782514a..cafd928a3b5 100644 --- a/nsprpub/pr/src/md/unix/uxrng.c +++ b/nsprpub/pr/src/md/unix/uxrng.c @@ -112,24 +112,6 @@ GetHighResClock(void *buf, size_t maxbytes) return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t)); } -#elif defined(VMS) - -#include - -/* - * Use the "get the cycle counter" instruction on the alpha. - * The low 32 bits completely turn over in less than a minute. - * The high 32 bits are some non-counter gunk that changes sometimes. - */ -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - uint64 t; - - t = __RPCC(); - return _pr_CopyLowBits(buf, maxbytes, &t, sizeof(t)); -} - #elif defined(AIX) static size_t diff --git a/nsprpub/pr/src/md/windows/ntsec.c b/nsprpub/pr/src/md/windows/ntsec.c index 2ef73a05029..1acb6c4c293 100644 --- a/nsprpub/pr/src/md/windows/ntsec.c +++ b/nsprpub/pr/src/md/windows/ntsec.c @@ -75,7 +75,8 @@ void _PR_NT_InitSids(void) SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_WORLD_SID_AUTHORITY; HANDLE hToken = NULL; /* initialized to an arbitrary value to * silence a Purify UMR warning */ - UCHAR infoBuffer[1024]; + PSID infoBuffer[1024/sizeof(PSID)]; /* defined as an array of PSIDs + * to force proper alignment */ PTOKEN_OWNER pTokenOwner = (PTOKEN_OWNER) infoBuffer; PTOKEN_PRIMARY_GROUP pTokenPrimaryGroup = (PTOKEN_PRIMARY_GROUP) infoBuffer; diff --git a/nsprpub/pr/src/misc/pralarm.c b/nsprpub/pr/src/misc/pralarm.c index 9323bab6774..932d077f688 100644 --- a/nsprpub/pr/src/misc/pralarm.c +++ b/nsprpub/pr/src/misc/pralarm.c @@ -41,11 +41,7 @@ /******************************* PRALARM ******************************/ /**********************************************************************/ -#ifdef XP_MAC -#include "pralarm.h" -#else #include "obsolete/pralarm.h" -#endif struct PRAlarmID { /* typedef'd in pralarm.h */ PRCList list; /* circular list linkage */ diff --git a/nsprpub/pr/src/misc/prenv.c b/nsprpub/pr/src/misc/prenv.c index 5f16ce1890d..e07e0737126 100644 --- a/nsprpub/pr/src/misc/prenv.c +++ b/nsprpub/pr/src/misc/prenv.c @@ -97,13 +97,3 @@ PR_IMPLEMENT(PRStatus) PR_SetEnv(const char *string) _PR_UNLOCK_ENV(); return (result)? PR_FAILURE : PR_SUCCESS; } - -/* -** DEPRECATED. Use PR_SetEnv() instead. -*/ -#ifdef XP_MAC -PR_IMPLEMENT(PRIntn) PR_PutEnv(const char *string) -{ - return (PR_SetEnv(string) == PR_SUCCESS) ? PR_TRUE : PR_FALSE; -} -#endif diff --git a/nsprpub/pr/src/misc/prinit.c b/nsprpub/pr/src/misc/prinit.c index dc4ca98c20e..bfac4c281ed 100644 --- a/nsprpub/pr/src/misc/prinit.c +++ b/nsprpub/pr/src/misc/prinit.c @@ -233,11 +233,11 @@ static void _PR_InitStuff(void) _PR_InitCMon(); _PR_InitIO(); _PR_InitNet(); + _PR_InitTime(); _PR_InitLog(); _PR_InitLinker(); _PR_InitCallOnce(); _PR_InitDtoa(); - _PR_InitTime(); _PR_InitMW(); _PR_InitRWLocks(); @@ -295,20 +295,12 @@ PR_IMPLEMENT(void) PR_UnblockClockInterrupts(void) PR_IMPLEMENT(void) PR_Init( PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs) { -#if defined(XP_MAC) -#pragma unused (type, priority, maxPTDs) -#endif - _PR_ImplicitInitialization(); } PR_IMPLEMENT(PRIntn) PR_Initialize( PRPrimordialFn prmain, PRIntn argc, char **argv, PRUintn maxPTDs) { -#if defined(XP_MAC) -#pragma unused (maxPTDs) -#endif - PRIntn rv; _PR_ImplicitInitialization(); rv = prmain(argc, argv); @@ -402,6 +394,11 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() while (_pr_userActive > _pr_primordialExitCount) { PR_WaitCondVar(_pr_primordialExitCVar, PR_INTERVAL_NO_TIMEOUT); } + if (me->flags & _PR_SYSTEM) { + _pr_systemActive--; + } else { + _pr_userActive--; + } PR_Unlock(_pr_activeLock); #ifdef IRIX @@ -857,13 +854,9 @@ PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg( PRBool _PR_Obsolete(const char *obsolete, const char *preferred) { #if defined(DEBUG) -#ifndef XP_MAC PR_fprintf( PR_STDERR, "'%s' is obsolete. Use '%s' instead.\n", obsolete, (NULL == preferred) ? "something else" : preferred); -#else -#pragma unused (obsolete, preferred) -#endif #endif return PR_FALSE; } /* _PR_Obsolete */ diff --git a/nsprpub/pr/src/misc/prnetdb.c b/nsprpub/pr/src/misc/prnetdb.c index 449f68f37e2..c8c1a628ee1 100644 --- a/nsprpub/pr/src/misc/prnetdb.c +++ b/nsprpub/pr/src/misc/prnetdb.c @@ -760,15 +760,10 @@ _pr_find_getipnodebyname(void) { PRLibrary *lib; PRStatus rv; -#if defined(VMS) -#define GETIPNODEBYNAME getenv("GETIPNODEBYNAME") -#define GETIPNODEBYADDR getenv("GETIPNODEBYADDR") -#define FREEHOSTENT getenv("FREEHOSTENT") -#else #define GETIPNODEBYNAME "getipnodebyname" #define GETIPNODEBYADDR "getipnodebyaddr" #define FREEHOSTENT "freehostent" -#endif + _pr_getipnodebyname_fp = PR_FindSymbolAndLibrary(GETIPNODEBYNAME, &lib); if (NULL != _pr_getipnodebyname_fp) { _pr_freehostent_fp = PR_FindSymbol(lib, FREEHOSTENT); @@ -1893,15 +1888,9 @@ static FN_GETADDRINFO _pr_getaddrinfo = NULL; static FN_FREEADDRINFO _pr_freeaddrinfo = NULL; static FN_GETNAMEINFO _pr_getnameinfo = NULL; -#if defined(VMS) -#define GETADDRINFO_SYMBOL getenv("GETADDRINFO") -#define FREEADDRINFO_SYMBOL getenv("FREEADDRINFO") -#define GETNAMEINFO_SYMBOL getenv("GETNAMEINFO") -#else #define GETADDRINFO_SYMBOL "getaddrinfo" #define FREEADDRINFO_SYMBOL "freeaddrinfo" #define GETNAMEINFO_SYMBOL "getnameinfo" -#endif PRStatus _pr_find_getaddrinfo(void) diff --git a/nsprpub/pr/src/misc/prolock.c b/nsprpub/pr/src/misc/prolock.c index f7339bacd72..a1d8a0f3ad2 100644 --- a/nsprpub/pr/src/misc/prolock.c +++ b/nsprpub/pr/src/misc/prolock.c @@ -51,9 +51,6 @@ PR_IMPLEMENT(PROrderedLock *) const char *name ) { -#ifdef XP_MAC -#pragma unused( order, name ) -#endif PR_ASSERT(!"Not implemented"); /* Not implemented yet */ PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return NULL; @@ -65,9 +62,6 @@ PR_IMPLEMENT(void) PROrderedLock *lock ) { -#ifdef XP_MAC -#pragma unused( lock ) -#endif PR_ASSERT(!"Not implemented"); /* Not implemented yet */ PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); } /* end PR_DestroyOrderedLock() */ @@ -78,9 +72,6 @@ PR_IMPLEMENT(void) PROrderedLock *lock ) { -#ifdef XP_MAC -#pragma unused( lock ) -#endif PR_ASSERT(!"Not implemented"); /* Not implemented yet */ PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); } /* end PR_LockOrderedLock() */ @@ -91,9 +82,6 @@ PR_IMPLEMENT(PRStatus) PROrderedLock *lock ) { -#ifdef XP_MAC -#pragma unused( lock ) -#endif PR_ASSERT(!"Not implemented"); /* Not implemented yet */ PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return PR_FAILURE; diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c index 1c9fd86121c..1996468f877 100644 --- a/nsprpub/pr/src/misc/prsystem.c +++ b/nsprpub/pr/src/misc/prsystem.c @@ -226,12 +226,6 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors( void ) GetSystemInfo( &info ); numCpus = info.dwNumberOfProcessors; -#elif defined(XP_MAC) -/* Hard-code the number of processors to 1 on the Mac -** MacOS/9 will always be 1. The MPProcessors() call is for -** MacOS/X, when issued. Leave it commented out for now. */ -/* numCpus = MPProcessors(); */ - numCpus = 1; #elif defined(BEOS) system_info sysInfo; diff --git a/nsprpub/pr/src/misc/prthinfo.c b/nsprpub/pr/src/misc/prthinfo.c index 76c44888461..6dcf9c6a81e 100644 --- a/nsprpub/pr/src/misc/prthinfo.c +++ b/nsprpub/pr/src/misc/prthinfo.c @@ -37,11 +37,7 @@ #include "prlog.h" #include "prthread.h" -#ifdef XP_MAC -#include "pprthred.h" -#else #include "private/pprthred.h" -#endif #include "primpl.h" PR_IMPLEMENT(PRWord *) @@ -175,9 +171,6 @@ typedef struct PRScanStackData { static PRStatus PR_CALLBACK pr_ScanStack(PRThread* t, int i, void* arg) { -#if defined(XP_MAC) -#pragma unused (i) -#endif PRScanStackData* data = (PRScanStackData*)arg; return PR_ThreadScanStackPointers(t, data->scanFun, data->scanClosure); } diff --git a/nsprpub/pr/src/misc/prtime.c b/nsprpub/pr/src/misc/prtime.c index 9a3be28e15d..287ab88f822 100644 --- a/nsprpub/pr/src/misc/prtime.c +++ b/nsprpub/pr/src/misc/prtime.c @@ -500,8 +500,8 @@ PR_NormalizeTime(PRExplodedTime *time, PRTimeParamFn params) * returns the time parameters for the local time zone * * The following uses localtime() from the standard C library. - * (time.h) This is our fallback implementation. Unix and PC - * use this version. Mac has its own machine-dependent + * (time.h) This is our fallback implementation. Unix, PC, and BeOS + * use this version. A platform may have its own machine-dependent * implementation of this function. * *------------------------------------------------------------------------- @@ -529,10 +529,6 @@ PR_NormalizeTime(PRExplodedTime *time, PRTimeParamFn params) #else -#if defined(XP_MAC) -extern struct tm *Maclocaltime(const time_t * t); -#endif - #define HAVE_LOCALTIME_MONITOR 1 /* We use 'monitor' to serialize our calls * to localtime(). */ static PRLock *monitor = NULL; @@ -562,11 +558,7 @@ static struct tm *MT_safe_localtime(const time_t *clock, struct tm *result) * structs returned for timezones west of Greenwich when clock == 0. */ -#if defined(XP_MAC) - tmPtr = Maclocaltime(clock); -#else tmPtr = localtime(clock); -#endif #if defined(WIN16) || defined(XP_OS2) if ( (PRInt32) *clock < 0 || @@ -754,7 +746,7 @@ PR_LocalTimeParameters(const PRExplodedTime *gmt) return retVal; } -#endif /* defined(XP_UNIX) !! defined(XP_PC) */ +#endif /* defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS) */ /* *------------------------------------------------------------------------ @@ -908,10 +900,6 @@ PR_USPacificTimeParameters(const PRExplodedTime *gmt) PR_IMPLEMENT(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt) { -#if defined(XP_MAC) -#pragma unused (gmt) -#endif - PRTimeParameters retVal = { 0, 0 }; return retVal; } diff --git a/nsprpub/pr/src/nspr_symvec.opt b/nsprpub/pr/src/nspr_symvec.opt deleted file mode 100644 index d9ca566ecff..00000000000 --- a/nsprpub/pr/src/nspr_symvec.opt +++ /dev/null @@ -1,503 +0,0 @@ -! Fixed section of symbol vector for LIBNSPR4 (non-debug) -! -GSMATCH=LEQUAL,2,8 -case_sensitive=YES -! -! -------------------------------------------------------------------------- -! Ident 2,1 introduced for Mozilla 0.9.4 -! Based on NSPR 4.1.2 -! -------------------------------------------------------------------------- -! Ident 2,2 introduced for Mozilla 1.2 -! Based on NSPR 4.2.2? -! PR_ResumeSet, PR_ResumeTest, and PR_SuspendAllSuspended has been "removed". -! Only we can't remove the entry points because OJI is linked against NSPR so -! we have to make an upwardly compatible change: -! PR_ResumeSet is now PR_VMS_Stub1 -! PR_ResumeTest is now PR_VMS_Stub2 -! PR_SuspendAllSuspended is PR_VMS_Stub3 -! These are stub functions (defined in openvms.c) solely for the purpose of -! occupying the slots in our fixed section of the symbol table. -! -------------------------------------------------------------------------- -! Ident 2,3 introduced for Mozilla 1.3 -! Previously we were missing some symbols from NSPR 4.0 and 4.1, so now we -! include everything that's specified in nspr.def. -! -------------------------------------------------------------------------- -! Ident 2,4 introduced for Mozilla 1.3 final. -! 2,3 was still missing some symbols, in particular PR_CreateThread, which -! is used by OJI. So insert stubs to force the PR_CreateThread entry down -! to its Mozilla 1.1 (and Java 1.4-0) location so that everyone can play -! together and be happy. -! -------------------------------------------------------------------------- -! Ident 2,5 introduced for post Mozilla 1.3. -! LL_MaxUint introduced. Replaces Stub54. -! -------------------------------------------------------------------------- -! Ident 2,6 introduced for post Mozilla 1.4. -! PR_GetPathSeparator introduced in NSPR 4.4. -! This replaces stub 53 -! -------------------------------------------------------------------------- -! Ident 2,7 introduced for post Mozilla 1.4. -! PR_GetAddrInfoByName, PR_FreeAddrInfo, PR_EnumerateAddrInfo and -! PR_GetCanonNameFromAddrInfo introduced in NSPR 4.5. -! These replace stubs 49-52 -! -------------------------------------------------------------------------- -! Ident 2,8 introduced for NSPR 4.6. -! PR_FindLibrary removed. Replaced by PR_GetPhysicalMemorySize. -! -------------------------------------------------------------------------- -! -SYMBOL_VECTOR=(PR_Accept=PROCEDURE) -SYMBOL_VECTOR=(PR_AcceptRead=PROCEDURE) -SYMBOL_VECTOR=(PR_Access=PROCEDURE) -SYMBOL_VECTOR=(PR_AllocFileDesc=PROCEDURE) -SYMBOL_VECTOR=(PR_Assert=PROCEDURE) -SYMBOL_VECTOR=(PR_AtomicAdd=PROCEDURE) -SYMBOL_VECTOR=(PR_AtomicDecrement=PROCEDURE) -SYMBOL_VECTOR=(PR_AtomicSet=PROCEDURE) -SYMBOL_VECTOR=(PR_AttachSharedMemory=PROCEDURE) -SYMBOL_VECTOR=(PR_AttachThread=PROCEDURE) -SYMBOL_VECTOR=(PR_Available64=PROCEDURE) -SYMBOL_VECTOR=(PR_Available=PROCEDURE) -SYMBOL_VECTOR=(PR_Bind=PROCEDURE) -SYMBOL_VECTOR=(PR_BlockClockInterrupts=PROCEDURE) -SYMBOL_VECTOR=(PR_BlockInterrupt=PROCEDURE) -SYMBOL_VECTOR=(PR_CExitMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_CNotify=PROCEDURE) -SYMBOL_VECTOR=(PR_CNotifyAll=PROCEDURE) -SYMBOL_VECTOR=(PR_CSetOnMonitorRecycle=PROCEDURE) -SYMBOL_VECTOR=(PR_CWait=PROCEDURE) -SYMBOL_VECTOR=(PR_CallOnce=PROCEDURE) -SYMBOL_VECTOR=(PR_Calloc=PROCEDURE) -SYMBOL_VECTOR=(PR_CancelJob=PROCEDURE) -SYMBOL_VECTOR=(PR_CancelWaitFileDesc=PROCEDURE) -SYMBOL_VECTOR=(PR_CancelWaitGroup=PROCEDURE) -SYMBOL_VECTOR=(PR_ChangeFileDescNativeHandle=PROCEDURE) -SYMBOL_VECTOR=(PR_Cleanup=PROCEDURE) -SYMBOL_VECTOR=(PR_ClearInterrupt=PROCEDURE) -SYMBOL_VECTOR=(PR_ClearThreadGCAble=PROCEDURE) -SYMBOL_VECTOR=(PR_Close=PROCEDURE) -SYMBOL_VECTOR=(PR_CloseDir=PROCEDURE) -SYMBOL_VECTOR=(PR_CloseFileMap=PROCEDURE) -SYMBOL_VECTOR=(PR_CloseSemaphore=PROCEDURE) -SYMBOL_VECTOR=(PR_CloseSharedMemory=PROCEDURE) -SYMBOL_VECTOR=(PR_Connect=PROCEDURE) -SYMBOL_VECTOR=(PR_ConnectContinue=PROCEDURE) -SYMBOL_VECTOR=(PR_ConvertIPv4AddrToIPv6=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateIOLayer=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateIOLayerStub=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateMWaitEnumerator=PROCEDURE) -SYMBOL_VECTOR=(PR_CreatePipe=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateProcess=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateProcessDetached=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateSocketPollFd=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateStack=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateThreadGCAble=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateWaitGroup=PROCEDURE) -SYMBOL_VECTOR=(PR_Delete=PROCEDURE) -SYMBOL_VECTOR=(PR_DeleteSemaphore=PROCEDURE) -SYMBOL_VECTOR=(PR_DeleteSharedMemory=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyAlarm=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyCondVar=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyLock=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyMWaitEnumerator=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyPollableEvent=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyProcessAttr=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyRWLock=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroySem=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroySocketPollFd=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyStack=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyWaitGroup=PROCEDURE) -SYMBOL_VECTOR=(PR_DetachProcess=PROCEDURE) -SYMBOL_VECTOR=(PR_DetachSharedMemory=PROCEDURE) -SYMBOL_VECTOR=(PR_DetachThread=PROCEDURE) -SYMBOL_VECTOR=(PR_DisableClockInterrupts=PROCEDURE) -SYMBOL_VECTOR=(PR_EmulateAcceptRead=PROCEDURE) -SYMBOL_VECTOR=(PR_EmulateSendFile=PROCEDURE) -SYMBOL_VECTOR=(PR_EnableClockInterrupts=PROCEDURE) -SYMBOL_VECTOR=(PR_EnterMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_EnumerateHostEnt=PROCEDURE) -SYMBOL_VECTOR=(PR_EnumerateThreads=PROCEDURE) -SYMBOL_VECTOR=(PR_EnumerateWaitGroup=PROCEDURE) -SYMBOL_VECTOR=(PR_ErrorInstallCallback=PROCEDURE) -SYMBOL_VECTOR=(PR_ErrorInstallTable=PROCEDURE) -SYMBOL_VECTOR=(PR_ErrorLanguages=PROCEDURE) -SYMBOL_VECTOR=(PR_ErrorToName=PROCEDURE) -SYMBOL_VECTOR=(PR_ExitMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_ExportFileMapAsString=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_CLR=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_ISSET=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_NCLR=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_NISSET=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_NSET=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_SET=PROCEDURE) -SYMBOL_VECTOR=(PR_FD_ZERO=PROCEDURE) -SYMBOL_VECTOR=(PR_FileDesc2NativeHandle=PROCEDURE) -SYMBOL_VECTOR=(PR_FindFunctionSymbol=PROCEDURE) -SYMBOL_VECTOR=(PR_FindFunctionSymbolAndLibrary=PROCEDURE) -SYMBOL_VECTOR=(PR_GetPhysicalMemorySize=PROCEDURE) -SYMBOL_VECTOR=(PR_FindSymbol=PROCEDURE) -SYMBOL_VECTOR=(PR_FindSymbolAndLibrary=PROCEDURE) -SYMBOL_VECTOR=(PR_FloorLog2=PROCEDURE) -SYMBOL_VECTOR=(PR_FormatTime=PROCEDURE) -SYMBOL_VECTOR=(PR_FormatTimeUSEnglish=PROCEDURE) -SYMBOL_VECTOR=(PR_Free=PROCEDURE) -SYMBOL_VECTOR=(PR_FreeLibraryName=PROCEDURE) -SYMBOL_VECTOR=(PR_GMTParameters=PROCEDURE) -SYMBOL_VECTOR=(PR_GetConnectStatus=PROCEDURE) -SYMBOL_VECTOR=(PR_GetCurrentThread=PROCEDURE) -SYMBOL_VECTOR=(PR_GetDefaultIOMethods=PROCEDURE) -SYMBOL_VECTOR=(PR_GetDirectorySepartor=PROCEDURE) -SYMBOL_VECTOR=(PR_GetError=PROCEDURE) -SYMBOL_VECTOR=(PR_GetErrorText=PROCEDURE) -SYMBOL_VECTOR=(PR_GetErrorTextLength=PROCEDURE) -SYMBOL_VECTOR=(PR_GetFileInfo64=PROCEDURE) -SYMBOL_VECTOR=(PR_GetFileInfo=PROCEDURE) -SYMBOL_VECTOR=(PR_GetFileMethods=PROCEDURE) -SYMBOL_VECTOR=(PR_GetHostByAddr=PROCEDURE) -SYMBOL_VECTOR=(PR_GetHostByName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetIPNodeByName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetIdentitiesLayer=PROCEDURE) -SYMBOL_VECTOR=(PR_GetInheritedFD=PROCEDURE) -SYMBOL_VECTOR=(PR_GetInheritedFileMap=PROCEDURE) -SYMBOL_VECTOR=(PR_GetLayersIdentity=PROCEDURE) -SYMBOL_VECTOR=(PR_GetLibraryName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetLibraryPath=PROCEDURE) -SYMBOL_VECTOR=(PR_GetMemMapAlignment=PROCEDURE) -SYMBOL_VECTOR=(PR_GetMonitorEntryCount=PROCEDURE) -SYMBOL_VECTOR=(PR_GetNameForIdentity=PROCEDURE) -SYMBOL_VECTOR=(PR_GetNumberOfProcessors=PROCEDURE) -SYMBOL_VECTOR=(PR_GetOSError=PROCEDURE) -SYMBOL_VECTOR=(PR_GetOpenFileInfo64=PROCEDURE) -SYMBOL_VECTOR=(PR_GetOpenFileInfo=PROCEDURE) -SYMBOL_VECTOR=(PR_GetPageShift=PROCEDURE) -SYMBOL_VECTOR=(PR_GetPeerName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetPipeMethods=PROCEDURE) -SYMBOL_VECTOR=(PR_GetProtoByName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetProtoByNumber=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSP=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSockName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSocketOption=PROCEDURE) -SYMBOL_VECTOR=(PR_GetStackSpaceLeft=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSysfdTableMax=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSystemInfo=PROCEDURE) -SYMBOL_VECTOR=(PR_GetTCPMethods=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadAffinityMask=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadID=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadPriority=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadPrivate=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadScope=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadState=PROCEDURE) -SYMBOL_VECTOR=(PR_GetThreadType=PROCEDURE) -SYMBOL_VECTOR=(PR_GetUDPMethods=PROCEDURE) -SYMBOL_VECTOR=(PR_ImplodeTime=PROCEDURE) -SYMBOL_VECTOR=(PR_ImportFile=PROCEDURE) -SYMBOL_VECTOR=(PR_ImportFileMapFromString=PROCEDURE) -SYMBOL_VECTOR=(PR_ImportPipe=PROCEDURE) -SYMBOL_VECTOR=(PR_ImportTCPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_ImportUDPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_Init=PROCEDURE) -SYMBOL_VECTOR=(PR_Initialize=PROCEDURE) -SYMBOL_VECTOR=(PR_InitializeNetAddr=PROCEDURE) -SYMBOL_VECTOR=(PR_Initialized=PROCEDURE) -SYMBOL_VECTOR=(PR_Interrupt=PROCEDURE) -SYMBOL_VECTOR=(PR_IntervalToMicroseconds=PROCEDURE) -SYMBOL_VECTOR=(PR_IntervalToMilliseconds=PROCEDURE) -SYMBOL_VECTOR=(PR_IntervalToSeconds=PROCEDURE) -SYMBOL_VECTOR=(PR_IsNetAddrType=PROCEDURE) -SYMBOL_VECTOR=(PR_JoinJob=PROCEDURE) -SYMBOL_VECTOR=(PR_JoinThread=PROCEDURE) -SYMBOL_VECTOR=(PR_JoinThreadPool=PROCEDURE) -SYMBOL_VECTOR=(PR_KillProcess=PROCEDURE) -SYMBOL_VECTOR=(PR_Listen=PROCEDURE) -SYMBOL_VECTOR=(PR_LoadLibrary=PROCEDURE) -SYMBOL_VECTOR=(PR_LoadLibraryWithFlags=PROCEDURE) -SYMBOL_VECTOR=(PR_LoadStaticLibrary=PROCEDURE) -SYMBOL_VECTOR=(PR_LocalTimeParameters=PROCEDURE) -SYMBOL_VECTOR=(PR_Lock=PROCEDURE) -SYMBOL_VECTOR=(PR_LockFile=PROCEDURE) -SYMBOL_VECTOR=(PR_LogFlush=PROCEDURE) -SYMBOL_VECTOR=(PR_LogPrint=PROCEDURE) -SYMBOL_VECTOR=(PR_MakeDir=PROCEDURE) -SYMBOL_VECTOR=(PR_MemMap=PROCEDURE) -SYMBOL_VECTOR=(PR_MemUnmap=PROCEDURE) -SYMBOL_VECTOR=(PR_MicrosecondsToInterval=PROCEDURE) -SYMBOL_VECTOR=(PR_MillisecondsToInterval=PROCEDURE) -SYMBOL_VECTOR=(PR_MkDir=PROCEDURE) -SYMBOL_VECTOR=(PR_NetAddrToString=PROCEDURE) -SYMBOL_VECTOR=(PR_NewCondVar=PROCEDURE) -SYMBOL_VECTOR=(PR_NewLogModule=PROCEDURE) -SYMBOL_VECTOR=(PR_NewMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_NewNamedMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_NewProcessAttr=PROCEDURE) -SYMBOL_VECTOR=(PR_NewSem=PROCEDURE) -SYMBOL_VECTOR=(PR_NewTCPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_NewTCPSocketPair=PROCEDURE) -SYMBOL_VECTOR=(PR_NewUDPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_NormalizeTime=PROCEDURE) -SYMBOL_VECTOR=(PR_Notify=PROCEDURE) -SYMBOL_VECTOR=(PR_NotifyAll=PROCEDURE) -SYMBOL_VECTOR=(PR_NotifyAllCondVar=PROCEDURE) -SYMBOL_VECTOR=(PR_NotifyCondVar=PROCEDURE) -SYMBOL_VECTOR=(PR_Open=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenDir=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenFile=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenSemaphore=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenTCPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenUDPSocket=PROCEDURE) -SYMBOL_VECTOR=(PR_ParseTimeString=PROCEDURE) -SYMBOL_VECTOR=(PR_Poll=PROCEDURE) -SYMBOL_VECTOR=(PR_PopIOLayer=PROCEDURE) -SYMBOL_VECTOR=(PR_PostSem=PROCEDURE) -SYMBOL_VECTOR=(PR_PostSemaphore=PROCEDURE) -SYMBOL_VECTOR=(PR_ProcessAttrSetCurren1sb1r7b$=PROCEDURE) ! PR_ProcessAttrSetCurrentDirectory -SYMBOL_VECTOR=(PR_ProcessAttrSetInheri3dpg1d0$=PROCEDURE) ! PR_ProcessAttrSetInheritableFileMap -SYMBOL_VECTOR=(PR_ProcessAttrSetInheritableFD=PROCEDURE) -SYMBOL_VECTOR=(PR_ProcessAttrSetStdioRedirect=PROCEDURE) -SYMBOL_VECTOR=(PR_ProcessExit=PROCEDURE) -SYMBOL_VECTOR=(PR_PushIOLayer=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob_Accept=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob_Connect=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob_Read=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob_Timer=PROCEDURE) -SYMBOL_VECTOR=(PR_QueueJob_Write=PROCEDURE) -SYMBOL_VECTOR=(PR_RWLock_Rlock=PROCEDURE) -SYMBOL_VECTOR=(PR_RWLock_Unlock=PROCEDURE) -SYMBOL_VECTOR=(PR_RWLock_Wlock=PROCEDURE) -SYMBOL_VECTOR=(PR_Read=PROCEDURE) -SYMBOL_VECTOR=(PR_ReadDir=PROCEDURE) -SYMBOL_VECTOR=(PR_Realloc=PROCEDURE) -SYMBOL_VECTOR=(PR_Recv=PROCEDURE) -SYMBOL_VECTOR=(PR_RecvFrom=PROCEDURE) -SYMBOL_VECTOR=(PR_Rename=PROCEDURE) -SYMBOL_VECTOR=(PR_ResetAlarm=PROCEDURE) -SYMBOL_VECTOR=(PR_ResetProcessAttr=PROCEDURE) -SYMBOL_VECTOR=(PR_ResumeAll=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub1=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub2=PROCEDURE) -SYMBOL_VECTOR=(PR_RmDir=PROCEDURE) -SYMBOL_VECTOR=(PR_ScanStackPointers=PROCEDURE) -SYMBOL_VECTOR=(PR_SecondsToInterval=PROCEDURE) -SYMBOL_VECTOR=(PR_Seek64=PROCEDURE) -SYMBOL_VECTOR=(PR_Seek=PROCEDURE) -SYMBOL_VECTOR=(PR_Select=PROCEDURE) -SYMBOL_VECTOR=(PR_Send=PROCEDURE) -SYMBOL_VECTOR=(PR_SendFile=PROCEDURE) -SYMBOL_VECTOR=(PR_SendTo=PROCEDURE) -SYMBOL_VECTOR=(PR_SetAlarm=PROCEDURE) -SYMBOL_VECTOR=(PR_SetEnv=PROCEDURE) -SYMBOL_VECTOR=(PR_SetErrorText=PROCEDURE) -SYMBOL_VECTOR=(PR_SetFDInheritable=PROCEDURE) -SYMBOL_VECTOR=(PR_SetLogBuffering=PROCEDURE) -SYMBOL_VECTOR=(PR_SetLogFile=PROCEDURE) -SYMBOL_VECTOR=(PR_SetNetAddr=PROCEDURE) -SYMBOL_VECTOR=(PR_SetPollableEvent=PROCEDURE) -SYMBOL_VECTOR=(PR_SetSocketOption=PROCEDURE) -SYMBOL_VECTOR=(PR_SetStdioRedirect=PROCEDURE) -SYMBOL_VECTOR=(PR_SetSysfdTableSize=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadAffinityMask=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadDumpProc=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadGCAble=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadPriority=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadPrivate=PROCEDURE) -SYMBOL_VECTOR=(PR_SetThreadRecycleMode=PROCEDURE) -SYMBOL_VECTOR=(PR_Shutdown=PROCEDURE) -SYMBOL_VECTOR=(PR_ShutdownThreadPool=PROCEDURE) -SYMBOL_VECTOR=(PR_Sleep=PROCEDURE) -SYMBOL_VECTOR=(PR_Socket=PROCEDURE) -SYMBOL_VECTOR=(PR_StackPop=PROCEDURE) -SYMBOL_VECTOR=(PR_StackPush=PROCEDURE) -SYMBOL_VECTOR=(PR_Stat=PROCEDURE) -SYMBOL_VECTOR=(PR_SuspendAll=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub3=PROCEDURE) -SYMBOL_VECTOR=(PR_Sync=PROCEDURE) -SYMBOL_VECTOR=(PR_TLockFile=PROCEDURE) -SYMBOL_VECTOR=(PR_ThreadScanStackPointers=PROCEDURE) -SYMBOL_VECTOR=(PR_TicksPerSecond=PROCEDURE) -SYMBOL_VECTOR=(PR_TransmitFile=PROCEDURE) -SYMBOL_VECTOR=(PR_USPacificTimeParameters=PROCEDURE) -SYMBOL_VECTOR=(PR_UnblockClockInterrupts=PROCEDURE) -SYMBOL_VECTOR=(PR_UnblockInterrupt=PROCEDURE) -SYMBOL_VECTOR=(PR_UnloadLibrary=PROCEDURE) -SYMBOL_VECTOR=(PR_Unlock=PROCEDURE) -SYMBOL_VECTOR=(PR_UnlockFile=PROCEDURE) -SYMBOL_VECTOR=(PR_Wait=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitCondVar=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitForPollableEvent=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitProcess=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitRecvReady=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitSem=PROCEDURE) -SYMBOL_VECTOR=(PR_WaitSemaphore=PROCEDURE) -SYMBOL_VECTOR=(PR_Write=PROCEDURE) -SYMBOL_VECTOR=(PR_Writev=PROCEDURE) -SYMBOL_VECTOR=(PR_XIsLocked=PROCEDURE) -SYMBOL_VECTOR=(PR_XLock=PROCEDURE) -SYMBOL_VECTOR=(PR_XNotify=PROCEDURE) -SYMBOL_VECTOR=(PR_XNotifyAll=PROCEDURE) -SYMBOL_VECTOR=(PR_XUnlock=PROCEDURE) -SYMBOL_VECTOR=(PR_XWait=PROCEDURE) -SYMBOL_VECTOR=(PR_Yield=PROCEDURE) -SYMBOL_VECTOR=(PR_cnvtf=PROCEDURE) -SYMBOL_VECTOR=(PR_dtoa=PROCEDURE) -SYMBOL_VECTOR=(PR_htonl=PROCEDURE) -SYMBOL_VECTOR=(PR_htonll=PROCEDURE) -SYMBOL_VECTOR=(PR_htons=PROCEDURE) -SYMBOL_VECTOR=(PR_ntohl=PROCEDURE) -SYMBOL_VECTOR=(PR_ntohll=PROCEDURE) -SYMBOL_VECTOR=(PR_ntohs=PROCEDURE) -SYMBOL_VECTOR=(PR_smprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_smprintf_free=PROCEDURE) -SYMBOL_VECTOR=(PR_sprintf_append=PROCEDURE) -SYMBOL_VECTOR=(PR_sxprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_vfprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_vsmprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_vsnprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_vsprintf_append=PROCEDURE) -SYMBOL_VECTOR=(PR_vsxprintf=PROCEDURE) -! -! Start of 2,3 additions -! -SYMBOL_VECTOR=(LL_MaxInt=PROCEDURE) -SYMBOL_VECTOR=(LL_MinInt=PROCEDURE) -SYMBOL_VECTOR=(LL_Zero=PROCEDURE) -SYMBOL_VECTOR=(PR_Abort=PROCEDURE) -SYMBOL_VECTOR=(PR_AddToCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_AddWaitFileDesc=PROCEDURE) -SYMBOL_VECTOR=(PR_AtomicIncrement=PROCEDURE) -SYMBOL_VECTOR=(PR_CEnterMonitor=PROCEDURE) -SYMBOL_VECTOR=(PR_CeilingLog2=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateAlarm=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateFileMap=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateOrderedLock=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateTrace=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateThreadPool=PROCEDURE) -SYMBOL_VECTOR=(PR_DecrementCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyOrderedLock=PROCEDURE) -SYMBOL_VECTOR=(PR_DestroyTrace=PROCEDURE) -SYMBOL_VECTOR=(PR_ErrorToString=PROCEDURE) -SYMBOL_VECTOR=(PR_ExplodeTime=PROCEDURE) -SYMBOL_VECTOR=(PR_FindNextCounterQname=PROCEDURE) -SYMBOL_VECTOR=(PR_FindNextCounterRname=PROCEDURE) -SYMBOL_VECTOR=(PR_FindNextTraceQname=PROCEDURE) -SYMBOL_VECTOR=(PR_FindNextTraceRname=PROCEDURE) -SYMBOL_VECTOR=(PR_GetDescType=PROCEDURE) -SYMBOL_VECTOR=(PR_GetDirectorySeparator=PROCEDURE) -SYMBOL_VECTOR=(PR_GetCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_GetCounterHandleFromName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetCounterNameFromHandle=PROCEDURE) -SYMBOL_VECTOR=(PR_GetEnv=PROCEDURE) -SYMBOL_VECTOR=(PR_GetGCRegisters=PROCEDURE) -SYMBOL_VECTOR=(PR_GetPageSize=PROCEDURE) -SYMBOL_VECTOR=(PR_GetRandomNoise=PROCEDURE) -SYMBOL_VECTOR=(PR_GetSpecialFD=PROCEDURE) -SYMBOL_VECTOR=(PR_GetUniqueIdentity=PROCEDURE) -SYMBOL_VECTOR=(PR_GetTraceEntries=PROCEDURE) -SYMBOL_VECTOR=(PR_GetTraceHandleFromName=PROCEDURE) -SYMBOL_VECTOR=(PR_GetTraceNameFromHandle=PROCEDURE) -SYMBOL_VECTOR=(PR_GetTraceOption=PROCEDURE) -SYMBOL_VECTOR=(PR_IntervalNow=PROCEDURE) -SYMBOL_VECTOR=(PR_IncrementCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_Malloc=PROCEDURE) -SYMBOL_VECTOR=(PR_LockOrderedLock=PROCEDURE) -SYMBOL_VECTOR=(PR_NewLock=PROCEDURE) -SYMBOL_VECTOR=(PR_NewPollableEvent=PROCEDURE) -SYMBOL_VECTOR=(PR_NewRWLock=PROCEDURE) -SYMBOL_VECTOR=(PR_NewThreadPrivateIndex=PROCEDURE) -SYMBOL_VECTOR=(PR_Now=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenAnonFileMap=PROCEDURE) -SYMBOL_VECTOR=(PR_OpenSharedMemory=PROCEDURE) -SYMBOL_VECTOR=(PR_RecordTraceEntries=PROCEDURE) -SYMBOL_VECTOR=(PR_SetConcurrency=PROCEDURE) -SYMBOL_VECTOR=(PR_SetFDCacheSize=PROCEDURE) -SYMBOL_VECTOR=(PR_SetLibraryPath=PROCEDURE) -SYMBOL_VECTOR=(PR_SetCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_StringToNetAddr=PROCEDURE) -SYMBOL_VECTOR=(PR_SetTraceOption=PROCEDURE) -SYMBOL_VECTOR=(PR_SubtractFromCounter=PROCEDURE) -SYMBOL_VECTOR=(PR_VersionCheck=PROCEDURE) -SYMBOL_VECTOR=(PR_Trace=PROCEDURE) -SYMBOL_VECTOR=(PR_UnlockOrderedLock=PROCEDURE) -SYMBOL_VECTOR=(PR_fprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_snprintf=PROCEDURE) -SYMBOL_VECTOR=(PR_sscanf=PROCEDURE) -SYMBOL_VECTOR=(PR_strtod=PROCEDURE) -SYMBOL_VECTOR=(PRP_DestroyNakedCondVar=PROCEDURE) -SYMBOL_VECTOR=(PRP_NakedBroadcast=PROCEDURE) -SYMBOL_VECTOR=(PRP_NakedNotify=PROCEDURE) -SYMBOL_VECTOR=(PRP_NakedWait=PROCEDURE) -SYMBOL_VECTOR=(PRP_NewNakedCondVar=PROCEDURE) -SYMBOL_VECTOR=(PRP_TryLock=PROCEDURE) -SYMBOL_VECTOR=(libVersionPoint=PROCEDURE) -! -! NSPR private -! -SYMBOL_VECTOR=(GetExecutionEnvironment=PROCEDURE) -SYMBOL_VECTOR=(PT_FPrintStats=PROCEDURE) -SYMBOL_VECTOR=(SetExecutionEnvironment=PROCEDURE) -! -! Start of 2,4 additions -! 51 stubs (4 thru 54) so that PR_CreateThread ends up at 1B70. -! Over time some of these stubs will get replaced by new symbols. -! -SYMBOL_VECTOR=(PR_VMS_Stub4=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub5=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub6=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub7=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub8=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub9=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub10=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub11=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub12=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub13=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub14=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub15=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub16=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub17=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub18=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub19=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub20=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub21=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub22=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub23=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub24=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub25=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub26=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub27=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub28=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub29=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub30=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub31=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub32=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub33=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub34=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub35=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub36=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub37=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub38=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub39=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub40=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub41=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub42=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub43=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub44=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub45=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub46=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub47=PROCEDURE) -SYMBOL_VECTOR=(PR_VMS_Stub48=PROCEDURE) -SYMBOL_VECTOR=(PR_GetAddrInfoByName=PROCEDURE) ! was Stub49 -SYMBOL_VECTOR=(PR_FreeAddrInfo=PROCEDURE) ! was Stub50 -SYMBOL_VECTOR=(PR_EnumerateAddrInfo=PROCEDURE) ! was Stub51 -SYMBOL_VECTOR=(PR_GetCanonNameFromAddrInfo=PROCEDURE) ! was Stub52 -SYMBOL_VECTOR=(PR_GetPathSeparator=PROCEDURE) ! was Stub53 -SYMBOL_VECTOR=(LL_MaxUint=PROCEDURE) ! was Stub54 -! -SYMBOL_VECTOR=(PR_CallOnceWithArg=PROCEDURE) -SYMBOL_VECTOR=(PR_GetLibraryFilePathname=PROCEDURE) -SYMBOL_VECTOR=(PR_SetError=PROCEDURE) -SYMBOL_VECTOR=(PR_CreateThread=PROCEDURE) -! -! -------------------------------------------------------------------------- -! End of fixed section -! -------------------------------------------------------------------------- -! diff --git a/nsprpub/pr/src/prvrsion.c b/nsprpub/pr/src/prvrsion.c index b8f4916dbcd..7c494c654eb 100644 --- a/nsprpub/pr/src/prvrsion.c +++ b/nsprpub/pr/src/prvrsion.c @@ -41,9 +41,7 @@ /************************************************************************/ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ -#ifndef XP_MAC #include "_pr_bld.h" -#endif #if !defined(_BUILD_TIME) #ifdef HAVE_LONG_LONG #define _BUILD_TIME 0 diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c index 7896f25fcbb..8bb2610b520 100644 --- a/nsprpub/pr/src/pthreads/ptio.c +++ b/nsprpub/pr/src/pthreads/ptio.c @@ -211,7 +211,7 @@ static PRBool _pr_ipv6_v6only_on_by_default; || defined(HPUX10_30) || defined(HPUX11) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ - || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \ + || defined(BSDI) || defined(NTO) || defined(DARWIN) \ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) #define _PRSelectFdSetArg_t fd_set * #else @@ -295,8 +295,7 @@ static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len) #if defined(HAVE_SOCKLEN_T) \ || (defined(__GLIBC__) && __GLIBC__ >= 2) typedef socklen_t pt_SockLen; -#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(VMS) +#elif (defined(AIX) && !defined(AIX4_1)) typedef PRSize pt_SockLen; #else typedef PRIntn pt_SockLen; @@ -3270,7 +3269,7 @@ static PRIOMethods _pr_socketpollfd_methods = { #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ - || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \ + || defined(OPENBSD) || defined(BSDI) || defined(NTO) \ || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \ || defined(SYMBIAN) #define _PR_FCNTL_FLAGS O_NONBLOCK @@ -4704,7 +4703,7 @@ PR_IMPLEMENT(PRStatus) PR_UnlockFile(PRFileDesc *fd) PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) { -#if defined(AIX) || defined(VMS) || defined(SYMBIAN) +#if defined(AIX) || defined(SYMBIAN) return sysconf(_SC_OPEN_MAX); #else struct rlimit rlim; @@ -4718,7 +4717,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(PRIntn table_size) { -#if defined(AIX) || defined(VMS) || defined(SYMBIAN) +#if defined(AIX) || defined(SYMBIAN) return -1; #else struct rlimit rlim; diff --git a/nsprpub/pr/src/pthreads/ptthread.c b/nsprpub/pr/src/pthreads/ptthread.c index cc5e9cb1105..271ecfe5e2b 100644 --- a/nsprpub/pr/src/pthreads/ptthread.c +++ b/nsprpub/pr/src/pthreads/ptthread.c @@ -1040,6 +1040,10 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void) PR_Lock(pt_book.ml); while (pt_book.user > pt_book.this_many) PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT); + if (me->state & PT_THREAD_SYSTEM) + pt_book.system -= 1; + else + pt_book.user -= 1; PR_Unlock(pt_book.ml); _PR_CleanupMW(); @@ -1347,7 +1351,7 @@ static void suspend_signal_handler(PRIntn sig) while (me->suspend & PT_THREAD_SUSPENDED) { #if !defined(FREEBSD) && !defined(NETBSD) && !defined(OPENBSD) \ - && !defined(BSDI) && !defined(VMS) && !defined(UNIXWARE) \ + && !defined(BSDI) && !defined(UNIXWARE) \ && !defined(DARWIN) && !defined(RISCOS) \ && !defined(SYMBIAN) /*XXX*/ PRIntn rv; @@ -1393,9 +1397,7 @@ static void pt_SuspendSet(PRThread *thred) PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("doing pthread_kill in pt_SuspendSet thred %p tid = %X\n", thred, thred->id)); -#if defined(VMS) - rv = thread_suspend(thred); -#elif defined(SYMBIAN) +#if defined(SYMBIAN) /* All signal group functions are not implemented in Symbian OS */ rv = 0; #else @@ -1452,9 +1454,7 @@ static void pt_ResumeSet(PRThread *thred) thred->suspend &= ~PT_THREAD_SUSPENDED; #if defined(PT_NO_SIGTIMEDWAIT) -#if defined(VMS) - thread_resume(thred); -#elif defined(SYMBIAN) +#if defined(SYMBIAN) /* All signal group functions are not implemented in Symbian OS */ #else pthread_kill(thred->id, SIGUSR1); diff --git a/nsprpub/pr/src/threads/combined/prucpu.c b/nsprpub/pr/src/threads/combined/prucpu.c index a3938b1ffe6..3a3596be4ae 100644 --- a/nsprpub/pr/src/threads/combined/prucpu.c +++ b/nsprpub/pr/src/threads/combined/prucpu.c @@ -392,9 +392,6 @@ static void PR_CALLBACK _PR_CPU_Idle(void *_cpu) PR_IMPLEMENT(void) PR_SetConcurrency(PRUintn numCPUs) { #if defined(_PR_GLOBAL_THREADS_ONLY) || defined(_PR_LOCAL_THREADS_ONLY) -#ifdef XP_MAC -#pragma unused(numCPUs) -#endif /* do nothing */ diff --git a/nsprpub/pr/src/threads/combined/prucv.c b/nsprpub/pr/src/threads/combined/prucv.c index 80d919b8906..6d5d6688ab9 100644 --- a/nsprpub/pr/src/threads/combined/prucv.c +++ b/nsprpub/pr/src/threads/combined/prucv.c @@ -299,9 +299,7 @@ void _PR_NotifyCondVar(PRCondVar *cvar, PRThread *me) _PR_CVAR_LOCK(cvar); q = cvar->condQ.next; while (q != &cvar->condQ) { -#ifndef XP_MAC PR_LOG(_pr_cvar_lm, PR_LOG_MIN, ("_PR_NotifyCondVar: cvar=%p", cvar)); -#endif if (_PR_THREAD_CONDQ_PTR(q)->wait.cvar) { if (_PR_NotifyThread(_PR_THREAD_CONDQ_PTR(q), me) == PR_TRUE) break; @@ -348,10 +346,8 @@ void _PR_ClockInterrupt(void) elapsed = now - cpu->last_clock; cpu->last_clock = now; -#ifndef XP_MAC PR_LOG(_pr_clock_lm, PR_LOG_MAX, ("ExpireWaits: elapsed=%lld usec", elapsed)); -#endif while(1) { _PR_SLEEPQ_LOCK(cpu); diff --git a/nsprpub/pr/src/threads/combined/prulock.c b/nsprpub/pr/src/threads/combined/prulock.c index 7c61fce1bdf..b188ed5d527 100644 --- a/nsprpub/pr/src/threads/combined/prulock.c +++ b/nsprpub/pr/src/threads/combined/prulock.c @@ -66,9 +66,7 @@ void _PR_IntsOn(_PRCPU *cpu) PR_ASSERT(cpu); /* Global threads don't have CPUs */ PR_ASSERT(_PR_MD_GET_INTSOFF() > 0); me = _PR_MD_CURRENT_THREAD(); -#if !defined(XP_MAC) PR_ASSERT(!(me->flags & _PR_IDLE_THREAD)); -#endif /* ** Process delayed interrupts. This logic is kinda scary because we @@ -92,10 +90,8 @@ void _PR_IntsOn(_PRCPU *cpu) cpu->u.missed[i] = 0; for (it = _pr_interruptTable; it->name; it++) { if (missed & it->missed_bit) { -#ifndef XP_MAC PR_LOG(_pr_sched_lm, PR_LOG_MIN, ("IntsOn[0]: %s intr", it->name)); -#endif (*it->handler)(); } } @@ -230,9 +226,7 @@ PR_IMPLEMENT(void) PR_Lock(PRLock *lock) PRCList *q; PR_ASSERT(me != suspendAllThread); -#if !defined(XP_MAC) PR_ASSERT(!(me->flags & _PR_IDLE_THREAD)); -#endif PR_ASSERT(lock != NULL); #ifdef _PR_GLOBAL_THREADS_ONLY PR_ASSERT(lock->owner != me); @@ -343,9 +337,7 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock *lock) PR_ASSERT(lock != NULL); PR_ASSERT(lock->owner == me); PR_ASSERT(me != suspendAllThread); -#if !defined(XP_MAC) PR_ASSERT(!(me->flags & _PR_IDLE_THREAD)); -#endif if (lock->owner != me) { return PR_FAILURE; } diff --git a/nsprpub/pr/src/threads/combined/pruthr.c b/nsprpub/pr/src/threads/combined/pruthr.c index 7e31b56bf6e..9609d4d97dc 100644 --- a/nsprpub/pr/src/threads/combined/pruthr.c +++ b/nsprpub/pr/src/threads/combined/pruthr.c @@ -49,10 +49,6 @@ #pragma warning(disable : 4101) #endif -#if defined(XP_MAC) -#include -#endif - /* _pr_activeLock protects the following global variables */ PRLock *_pr_activeLock; PRInt32 _pr_primordialExitCount; /* In PR_Cleanup(), the primordial thread @@ -98,10 +94,6 @@ static void _PR_UserRunThread(void); void _PR_InitThreads(PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs) { -#if defined(XP_MAC) -#pragma unused (maxPTDs) -#endif - PRThread *thread; PRThreadStack *stack; @@ -116,8 +108,6 @@ void _PR_InitThreads(PRThreadType type, PRThreadPriority priority, #else #if defined(SOLARIS) || defined (UNIXWARE) && defined (USR_SVR4_THREADS) stack->stackTop = (char*) &thread; -#elif defined(XP_MAC) - stack->stackTop = (char*) LMGetCurStackBase(); #else stack->stackTop = (char*) ((((long)&type + _pr_pageSize - 1) >> _pr_pageShift) << _pr_pageShift); @@ -923,9 +913,7 @@ void _PR_Schedule(void) /* * skip non-schedulable threads */ -#if !defined(XP_MAC) PR_ASSERT(!(thread->flags & _PR_IDLE_THREAD)); -#endif if ((thread->no_sched) && (me != thread)){ thread = NULL; continue; @@ -1005,10 +993,6 @@ static PRThread * _PR_AttachThread(PRThreadType type, PRThreadPriority priority, PRThreadStack *stack) { -#if defined(XP_MAC) -#pragma unused (type) -#endif - PRThread *thread; char *mem; @@ -1047,10 +1031,6 @@ _PR_NativeCreateThread(PRThreadType type, PRUint32 stackSize, PRUint32 flags) { -#if defined(XP_MAC) -#pragma unused (scope) -#endif - PRThread *thread; thread = _PR_AttachThread(type, priority, NULL); @@ -1504,9 +1484,6 @@ PRThread* _PRI_AttachThread(PRThreadType type, PR_IMPLEMENT(PRThread*) PR_AttachThread(PRThreadType type, PRThreadPriority priority, PRThreadStack *stack) { -#ifdef XP_MAC -#pragma unused( type, priority, stack ) -#endif return PR_GetCurrentThread(); } diff --git a/nsprpub/pr/src/threads/prcthr.c b/nsprpub/pr/src/threads/prcthr.c index 1e2f469c3a4..7c3e6273d19 100644 --- a/nsprpub/pr/src/threads/prcthr.c +++ b/nsprpub/pr/src/threads/prcthr.c @@ -304,11 +304,6 @@ PR_IMPLEMENT(PRInt32) PR_GetThreadAffinityMask(PRThread *thread, PRUint32 *mask) #ifdef HAVE_THREAD_AFFINITY return _PR_MD_GETTHREADAFFINITYMASK(thread, mask); #else - -#if defined(XP_MAC) -#pragma unused (thread, mask) -#endif - return 0; #endif } @@ -322,11 +317,6 @@ PR_IMPLEMENT(PRInt32) PR_SetThreadAffinityMask(PRThread *thread, PRUint32 mask ) return 0; #endif #else - -#if defined(XP_MAC) -#pragma unused (thread, mask) -#endif - return 0; #endif } @@ -354,10 +344,6 @@ PR_IMPLEMENT(PRInt32) PR_SetCPUAffinityMask(PRUint32 mask) } #endif -#if defined(XP_MAC) -#pragma unused (mask) -#endif - return 0; } @@ -397,9 +383,6 @@ PR_IMPLEMENT(PRThread*) PR_CreateThreadBound(PRThreadType type, PR_IMPLEMENT(PRThread*) PR_AttachThreadGCAble( PRThreadType type, PRThreadPriority priority, PRThreadStack *stack) { -#ifdef XP_MAC -#pragma unused (type, priority, stack) -#endif /* $$$$ not sure how to finese this one */ PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return NULL; @@ -423,9 +406,6 @@ PR_IMPLEMENT(void) PR_ClearThreadGCAble() PR_IMPLEMENT(PRThreadScope) PR_GetThreadScope(const PRThread *thread) { -#ifdef XP_MAC -#pragma unused( thread ) -#endif if (!_pr_initialized) _PR_ImplicitInitialization(); if (_PR_IS_NATIVE_THREAD(thread)) { diff --git a/nsprpub/pr/src/threads/prsem.c b/nsprpub/pr/src/threads/prsem.c index 692bc0e99b4..d26897cd3fc 100644 --- a/nsprpub/pr/src/threads/prsem.c +++ b/nsprpub/pr/src/threads/prsem.c @@ -36,11 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "primpl.h" -#if defined(XP_MAC) -#include "prsem.h" -#else #include "obsolete/prsem.h" -#endif /************************************************************************/ diff --git a/nsprpub/pr/tests/Makefile.in b/nsprpub/pr/tests/Makefile.in index b2fa391b54c..658d7c03ca7 100644 --- a/nsprpub/pr/tests/Makefile.in +++ b/nsprpub/pr/tests/Makefile.in @@ -147,6 +147,7 @@ CSRCS = \ prpollml.c \ ranfile.c \ randseed.c \ + reinit.c \ rmdir.c \ rwlocktest.c \ sel_spd.c \ diff --git a/nsprpub/pr/tests/accept.c b/nsprpub/pr/tests/accept.c index 1d59d5e8c70..f1bfde469a4 100644 --- a/nsprpub/pr/tests/accept.c +++ b/nsprpub/pr/tests/accept.c @@ -83,7 +83,7 @@ #define SERVER_MAX_BIND_COUNT 100 -#if defined(XP_MAC) || defined(XP_OS2) || defined(SYMBIAN) +#if defined(XP_OS2) || defined(SYMBIAN) #define TIMEOUTSECS 10 #else #define TIMEOUTSECS 2 @@ -489,11 +489,6 @@ int main(int argc, char **argv) output = PR_STDERR; PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("accept.log"); - debug_mode = 1; -#endif - timeoutTime = PR_SecondsToInterval(TIMEOUTSECS); if (debug_mode) PR_fprintf(output, "\nRun accept() sucessful connection tests\n"); diff --git a/nsprpub/pr/tests/alarm.c b/nsprpub/pr/tests/alarm.c index 7af2ed4c03c..7ae9d4fd105 100644 --- a/nsprpub/pr/tests/alarm.c +++ b/nsprpub/pr/tests/alarm.c @@ -58,11 +58,7 @@ #include "prlog.h" #include "prinit.h" -#ifdef XP_MAC -#include "pralarm.h" -#else #include "obsolete/pralarm.h" -#endif #include "prlock.h" #include "prlong.h" #include "prcvar.h" @@ -78,12 +74,6 @@ #include #endif -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static PRIntn debug_mode; static PRIntn failed_already=0; static PRThreadScope thread_scope = PR_LOCAL_THREAD; @@ -296,10 +286,6 @@ static PRIntervalTime Alarms1(PRUint32 loops) static PRBool AlarmFn2(PRAlarmID *id, void *clientData, PRUint32 late) { -#if defined(XP_MAC) -#pragma unused (id) -#endif - PRBool keepGoing; PRStatus rv = PR_SUCCESS; AlarmData *ad = (AlarmData*)clientData; @@ -534,10 +520,6 @@ int prmain(int argc, char** argv) if (debug_mode) printf("Alarm: Using %d cpu(s)\n", cpus); -#ifdef XP_MAC - SetupMacPrintfLog("alarm.log"); - debug_mode = 1; -#endif for (cpu = 1; cpu <= cpus; ++cpu) { diff --git a/nsprpub/pr/tests/cltsrv.c b/nsprpub/pr/tests/cltsrv.c index da5a4b83061..33553aa1103 100644 --- a/nsprpub/pr/tests/cltsrv.c +++ b/nsprpub/pr/tests/cltsrv.c @@ -82,16 +82,10 @@ #include #include - #if defined(XP_UNIX) #include #endif -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - /* ** This is the beginning of the test */ @@ -1033,10 +1027,6 @@ int main(int argc, char** argv) boolean = PR_SetLogFile("cltsrv.log"); MY_ASSERT(boolean); -#ifdef XP_MAC - debug_mode = PR_TRUE; -#endif - rv = PR_SetFDCacheSize(low, high); PR_ASSERT(PR_SUCCESS == rv); diff --git a/nsprpub/pr/tests/concur.c b/nsprpub/pr/tests/concur.c index 1f22d014695..d7b953941ed 100644 --- a/nsprpub/pr/tests/concur.c +++ b/nsprpub/pr/tests/concur.c @@ -50,11 +50,7 @@ #include "plgetopt.h" -#if defined(XP_MAC) -#include "pprio.h" -#else #include "private/pprio.h" -#endif #include diff --git a/nsprpub/pr/tests/cvar.c b/nsprpub/pr/tests/cvar.c index c3a84c5dbef..928e1d3c971 100644 --- a/nsprpub/pr/tests/cvar.c +++ b/nsprpub/pr/tests/cvar.c @@ -66,12 +66,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - PRMonitor *mon; #define DEFAULT_COUNT 1000 PRInt32 count = 0; @@ -302,11 +296,6 @@ static PRIntn PR_CALLBACK RealMain(int argc, char **argv) if (0 == count) count = DEFAULT_COUNT; -#ifdef XP_MAC - SetupMacPrintfLog("cvar.log"); - debug_mode = 1; -#endif - mon = PR_NewMonitor(); Measure(CondWaitContextSwitchUU, "cond var wait context switch- user/user"); diff --git a/nsprpub/pr/tests/cvar2.c b/nsprpub/pr/tests/cvar2.c index 604510ca7e7..5c33c614705 100644 --- a/nsprpub/pr/tests/cvar2.c +++ b/nsprpub/pr/tests/cvar2.c @@ -64,12 +64,6 @@ int _debug_on = 0; #define DPRINTF(arg) if (_debug_on) printf arg -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - #define DEFAULT_COUNT 100 #define DEFAULT_THREADS 5 PRInt32 count = DEFAULT_COUNT; @@ -947,10 +941,6 @@ static PRIntn PR_CALLBACK RealMain(int argc, char **argv) if (0 == count) count = DEFAULT_COUNT; if (0 == default_threads) default_threads = DEFAULT_THREADS; -#ifdef XP_MAC - SetupMacPrintfLog("cvar2.log"); -#endif - printf("\n\ CondVar Test: \n\ \n\ @@ -979,14 +969,8 @@ default_threads, default_threads*2, default_threads*3, default_threads*4); Measure(CondVarTestSUK, threads, "Condvar simple test shared UK"); Measure(CondVarTestPUU, threads, "Condvar simple test priv UU"); Measure(CondVarTestPUK, threads, "Condvar simple test priv UK"); -#ifdef XP_MAC - /* Mac heaps can't handle thread*4 stack allocations at a time for (10, 15, 20)*4 */ - Measure(CondVarTest, 5, "Condvar simple test All"); - Measure(CondVarTimeoutTest, 5, "Condvar timeout test"); -#else Measure(CondVarTest, threads, "Condvar simple test All"); Measure(CondVarTimeoutTest, threads, "Condvar timeout test"); -#endif #if 0 Measure(CondVarMixedTest, threads, "Condvar mixed timeout test"); Measure(CondVarCombinedTest, threads, "Combined condvar test"); diff --git a/nsprpub/pr/tests/fileio.c b/nsprpub/pr/tests/fileio.c index 0b154047ac6..efd4235afe3 100644 --- a/nsprpub/pr/tests/fileio.c +++ b/nsprpub/pr/tests/fileio.c @@ -66,14 +66,7 @@ #include -#ifdef XP_MAC -#include "prsem.h" -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif #define TBSIZE 1024 @@ -195,11 +188,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("fileio.log"); - debug_mode = 1; -#endif - emptyBufs = PR_NewSem(2); /* two empty buffers */ fullBufs = PR_NewSem(0); /* zero full buffers */ diff --git a/nsprpub/pr/tests/inrval.c b/nsprpub/pr/tests/inrval.c index aa06845c186..1fb35d13377 100644 --- a/nsprpub/pr/tests/inrval.c +++ b/nsprpub/pr/tests/inrval.c @@ -54,11 +54,7 @@ #include "plgetopt.h" #include "prinit.h" -#ifdef XP_MAC -#include "pralarm.h" -#else #include "obsolete/pralarm.h" -#endif #include "prio.h" #include "prprf.h" diff --git a/nsprpub/pr/tests/intrio.c b/nsprpub/pr/tests/intrio.c index ad678b3b11e..3e7c9c12820 100644 --- a/nsprpub/pr/tests/intrio.c +++ b/nsprpub/pr/tests/intrio.c @@ -46,12 +46,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - /* for synchronization between the main thread and iothread */ static PRLock *lock; static PRCondVar *cvar; diff --git a/nsprpub/pr/tests/intrupt.c b/nsprpub/pr/tests/intrupt.c index 1385bdddcac..1d9dc691966 100644 --- a/nsprpub/pr/tests/intrupt.c +++ b/nsprpub/pr/tests/intrupt.c @@ -55,12 +55,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - #define DEFAULT_TCP_PORT 12500 static PRLock *ml = NULL; @@ -258,11 +252,6 @@ void PR_CALLBACK Intrupt(void *arg) ml = PR_NewLock(); cv = PR_NewCondVar(ml); -#ifdef XP_MAC - SetupMacPrintfLog("intrupt.log"); - debug_mode = PR_TRUE; -#endif - /* Part I */ if (debug_mode) printf("Part I\n"); abortCV = PR_CreateThread( diff --git a/nsprpub/pr/tests/io_timeout.c b/nsprpub/pr/tests/io_timeout.c index 2a680aa5c1e..617d6e84c73 100644 --- a/nsprpub/pr/tests/io_timeout.c +++ b/nsprpub/pr/tests/io_timeout.c @@ -57,12 +57,6 @@ #include #include "nspr.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - #define NUM_THREADS 1 #define BASE_PORT 8000 #define DEFAULT_ACCEPT_TIMEOUT 2 @@ -276,11 +270,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_LOW, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("io_timeout.log"); - debug_mode = 1; -#endif - printf("test with global bound thread\n"); thread_test(PR_GLOBAL_BOUND_THREAD, num_threads); diff --git a/nsprpub/pr/tests/join.c b/nsprpub/pr/tests/join.c index 670df7ef700..0875aeb2153 100644 --- a/nsprpub/pr/tests/join.c +++ b/nsprpub/pr/tests/join.c @@ -64,11 +64,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif /*********************************************************************** ** PRIVATE FUNCTION: Test_Result ** DESCRIPTION: Used in conjunction with the regress tool, prints out the @@ -227,13 +222,6 @@ static PRIntn PR_CALLBACK RealMain(int argc, char **argv) } PL_DestroyOptState(opt); -#ifdef XP_MAC - SetupMacPrintfLog("join.log"); - debug_mode = 1; -#endif - - - /* main test */ printf("User-User test\n"); runTest(PR_LOCAL_THREAD, PR_LOCAL_THREAD); diff --git a/nsprpub/pr/tests/joinkk.c b/nsprpub/pr/tests/joinkk.c index 77f2176f195..ac731d39242 100644 --- a/nsprpub/pr/tests/joinkk.c +++ b/nsprpub/pr/tests/joinkk.c @@ -65,11 +65,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - PRIntn failed_already=0; PRIntn debug_mode; /* @@ -159,12 +154,6 @@ static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv ) } PL_DestroyOptState(opt); -#ifdef XP_MAC - SetupMacPrintfLog("join.log"); -#endif - - - /* main test */ if (debug_mode) printf("Kernel-Kernel test\n"); diff --git a/nsprpub/pr/tests/joinku.c b/nsprpub/pr/tests/joinku.c index c639ce1a81d..89d15291508 100644 --- a/nsprpub/pr/tests/joinku.c +++ b/nsprpub/pr/tests/joinku.c @@ -65,10 +65,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif PRIntn failed_already=0; PRIntn debug_mode; @@ -163,12 +159,6 @@ static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv ) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("joinku.log"); -#endif - - - /* main test */ if (debug_mode) printf("Kernel-User test\n"); diff --git a/nsprpub/pr/tests/joinuk.c b/nsprpub/pr/tests/joinuk.c index 07425932533..284a64e5c15 100644 --- a/nsprpub/pr/tests/joinuk.c +++ b/nsprpub/pr/tests/joinuk.c @@ -65,10 +65,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif PRIntn failed_already=0; PRIntn debug_mode; /* @@ -161,12 +157,6 @@ static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv ) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("joinuk.log"); -#endif - - - /* main test */ if (debug_mode) printf("User-Kernel test\n"); diff --git a/nsprpub/pr/tests/joinuu.c b/nsprpub/pr/tests/joinuu.c index 71f17a8369c..d8958a31f7d 100644 --- a/nsprpub/pr/tests/joinuu.c +++ b/nsprpub/pr/tests/joinuu.c @@ -65,10 +65,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif PRIntn failed_already=0; PRIntn debug_mode; @@ -163,12 +159,6 @@ static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv ) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("joinuu.log"); -#endif - - - /* main test */ if (debug_mode) printf("User-User test\n"); runTest(PR_LOCAL_THREAD, PR_LOCAL_THREAD); diff --git a/nsprpub/pr/tests/lock.c b/nsprpub/pr/tests/lock.c index 0f207ba0448..4b0db4a4366 100644 --- a/nsprpub/pr/tests/lock.c +++ b/nsprpub/pr/tests/lock.c @@ -87,12 +87,6 @@ #include #endif -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static PRIntn failed_already=0; static PRFileDesc *std_err = NULL; static PRBool verbosity = PR_FALSE; @@ -499,11 +493,6 @@ int main(int argc, char **argv) /* main test */ PR_SetConcurrency(8); -#ifdef XP_MAC - SetupMacPrintfLog("lock.log"); - debug_mode = 1; -#endif - if (loops == 0) loops = 100; if (debug_mode) { diff --git a/nsprpub/pr/tests/lockfile.c b/nsprpub/pr/tests/lockfile.c index 27f8821e53f..c737f00df1d 100644 --- a/nsprpub/pr/tests/lockfile.c +++ b/nsprpub/pr/tests/lockfile.c @@ -66,22 +66,12 @@ #include "prthread.h" #include "prtypes.h" -#ifndef XP_MAC #include "private/pprio.h" -#else -#include "pprio.h" -#endif #include #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - PRIntn failed_already=0; PRIntn debug_mode; @@ -241,11 +231,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("lockfile.log"); - debug_mode = 1; -#endif - if (argc > 1) loops = atoi(argv[1]); if (loops == 0) loops = 100; if (debug_mode) printf("Lock: Using %d loops\n", loops); diff --git a/nsprpub/pr/tests/logger.c b/nsprpub/pr/tests/logger.c index d17f2f97181..1280c269600 100644 --- a/nsprpub/pr/tests/logger.c +++ b/nsprpub/pr/tests/logger.c @@ -49,10 +49,6 @@ #include -#ifdef XP_MAC -extern void SetupMacPrintfLog(char *logFile); -#endif - /* lth. re-define PR_LOG() */ #if 0 #undef PR_LOG_TEST @@ -126,7 +122,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifndef XP_MAC if (argc > 1) { if (!PR_SetLogFile(argv[1])) @@ -135,9 +130,6 @@ int main(int argc, char **argv) goto exit; } } -#else - SetupMacPrintfLog("logger.log"); -#endif /* Start logging something here */ PR_LogPrint("%s logging into %s\n", argv[0], argv[1]); diff --git a/nsprpub/pr/tests/nbconn.c b/nsprpub/pr/tests/nbconn.c index 099150a5164..3598cba260b 100644 --- a/nsprpub/pr/tests/nbconn.c +++ b/nsprpub/pr/tests/nbconn.c @@ -61,12 +61,6 @@ #include #include -#ifdef XP_MAC -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -static char *hosts[4] = {"cynic", "warp", "gandalf", "neon"}; -#endif - #define SERVER_MAX_BIND_COUNT 100 #define DATA_BUF_SIZE 256 #define TCP_SERVER_PORT 10000 @@ -94,10 +88,6 @@ int main(int argc, char **argv) const char *hostname = NULL; PRIntn default_case, n, bytes_read, bytes_sent; PRInt32 failed_already = 0; -#ifdef XP_MAC - int index; - PRIntervalTime timeout; -#endif /* * -d debug mode @@ -122,23 +112,11 @@ int main(int argc, char **argv) } PL_DestroyOptState(opt); -#ifdef XP_MAC - SetupMacPrintfLog("nbconn.log"); - for (index=0; index<4; index++) { - argv[1] = hosts[index]; - timeout = PR_INTERVAL_NO_TIMEOUT; - if (index == 3) - timeout = PR_SecondsToInterval(10UL); -#endif - - PR_STDIO_INIT(); -#ifndef XP_MAC if (hostname) default_case = 0; else default_case = 1; -#endif if (default_case) { @@ -175,11 +153,7 @@ int main(int argc, char **argv) pd.fd = sock; pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; -#ifndef XP_MAC n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT); -#else - n = PR_Poll(&pd, 1, timeout); -#endif if (n == -1) { printf( "PR_Poll failed\n"); exit(1); @@ -203,8 +177,6 @@ int main(int argc, char **argv) if (PR_GetConnectStatus(&pd) == PR_SUCCESS) { printf("PR_GetConnectStatus: connect succeeded\n"); - /* Mac and Win16 have trouble printing to the console. */ -#if !defined(XP_MAC) && !defined(WIN16) PR_Write(sock, "GET /\r\n\r\n", 9); PR_Shutdown(sock, PR_SHUTDOWN_SEND); pd.in_flags = PR_POLL_READ; @@ -218,7 +190,6 @@ int main(int argc, char **argv) } PR_Write(PR_STDOUT, buf, n); } -#endif } else { if (PR_GetError() == PR_IN_PROGRESS_ERROR) { printf( "PR_GetConnectStatus: connect still in progress\n"); @@ -228,9 +199,6 @@ int main(int argc, char **argv) PR_GetError(), PR_GetOSError()); } PR_Close(sock); -#ifdef XP_MAC - } /* end of for loop */ -#endif printf( "PASS\n"); return 0; @@ -378,11 +346,7 @@ connection_success_test() DPRINTF(("Created TCP_Server thread [0x%x]\n",thr)); pd.fd = conn_fd; pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; -#ifndef XP_MAC n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT); -#else - n = PR_Poll(&pd, 1, timeout); -#endif if (n == -1) { fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n", PR_GetError(), PR_GetOSError()); @@ -556,11 +520,7 @@ connection_failure_test() } pd.fd = conn_fd; pd.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT; -#ifndef XP_MAC n = PR_Poll(&pd, 1, PR_INTERVAL_NO_TIMEOUT); -#else - n = PR_Poll(&pd, 1, timeout); -#endif if (n == -1) { fprintf(stderr,"Error - PR_Poll failed: (%d, %d)\n", PR_GetError(), PR_GetOSError()); diff --git a/nsprpub/pr/tests/nonblock.c b/nsprpub/pr/tests/nonblock.c index 293761894e2..bacb1cebedb 100644 --- a/nsprpub/pr/tests/nonblock.c +++ b/nsprpub/pr/tests/nonblock.c @@ -42,11 +42,7 @@ #include "prprf.h" #include "prnetdb.h" #include "plerror.h" -#ifndef XP_MAC #include "obsolete/probslet.h" -#else -#include "probslet.h" -#endif #include #include @@ -72,16 +68,6 @@ #include "pprio.h" #endif -#ifdef XP_MAC -int fprintf(FILE *stream, const char *fmt, ...) -{ -PR_LogPrint(fmt); -return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static void PR_CALLBACK clientThreadFunc(void *arg) { @@ -165,10 +151,6 @@ static PRIntn PR_CALLBACK RealMain( PRIntn argc, char **argv ) PRIntn i; PRIntervalTime unitTime = PR_MillisecondsToInterval(UNIT_TIME); -#ifdef XP_MAC - SetupMacPrintfLog("nonblock.log"); -#endif - /* Create a listening socket */ if ((listenSock = PR_NewTCPSocket()) == NULL) { fprintf(stderr, "Can't create a new TCP socket\n"); diff --git a/nsprpub/pr/tests/op_2long.c b/nsprpub/pr/tests/op_2long.c index 27f64d79079..deb55b7ab78 100644 --- a/nsprpub/pr/tests/op_2long.c +++ b/nsprpub/pr/tests/op_2long.c @@ -57,12 +57,6 @@ #include "plerror.h" #include "plgetopt.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#else -#endif - static PRFileDesc *t1; PRIntn error_code; @@ -88,10 +82,6 @@ int main(int argc, char **argv) } nameTooLong[TOO_LONG - 1] = 0; -#ifdef XP_MAC - SetupMacPrintfLog("pr_open_re.log"); -#endif - PR_STDIO_INIT(); t1 = PR_Open(nameTooLong, PR_RDWR, 0666); if (t1 == NULL) { diff --git a/nsprpub/pr/tests/op_filnf.c b/nsprpub/pr/tests/op_filnf.c index 5f6762500bd..c4cc48eedb9 100644 --- a/nsprpub/pr/tests/op_filnf.c +++ b/nsprpub/pr/tests/op_filnf.c @@ -57,24 +57,11 @@ #include #include "plgetopt.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#else -#endif - static PRFileDesc *t1; PRIntn error_code; int main(int argc, char **argv) { - - -#ifdef XP_MAC - SetupMacPrintfLog("pr_open_re.log"); -#endif - - PR_STDIO_INIT(); t1 = PR_Open("/usr/tmp/ttools/err03.tmp", PR_TRUNCATE | PR_RDWR, 0666); if (t1 == NULL) { diff --git a/nsprpub/pr/tests/op_filok.c b/nsprpub/pr/tests/op_filok.c index 5dcc45dfb58..9a5dc9b1a29 100644 --- a/nsprpub/pr/tests/op_filok.c +++ b/nsprpub/pr/tests/op_filok.c @@ -55,19 +55,11 @@ #include "prerror.h" #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#else -#endif - /* * The name of a file that is guaranteed to exist * on every machine of a particular OS. */ -#ifdef VMS -#define EXISTING_FILENAME "SYS$LOGIN:LOGIN.COM" -#elif defined(SYMBIAN) +#if defined(SYMBIAN) #define EXISTING_FILENAME "z:\\system\\install\\Series60v3.0.sis" #elif defined (XP_UNIX) #define EXISTING_FILENAME "/bin/sh" @@ -85,11 +77,6 @@ static PRFileDesc *t1; int main(int argc, char **argv) { - -#ifdef XP_MAC - SetupMacPrintfLog("pr_open_re.log"); -#endif - PR_STDIO_INIT(); t1 = PR_Open(EXISTING_FILENAME, PR_RDONLY, 0666); diff --git a/nsprpub/pr/tests/op_noacc.c b/nsprpub/pr/tests/op_noacc.c index ab1254dec36..2bc6256c55e 100644 --- a/nsprpub/pr/tests/op_noacc.c +++ b/nsprpub/pr/tests/op_noacc.c @@ -56,23 +56,11 @@ #include #include "plgetopt.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#else -#endif - static PRFileDesc *err01; PRIntn error_code; int main(int argc, char **argv) { - - -#ifdef XP_MAC - SetupMacPrintfLog("pr_open_re.log"); -#endif - #ifdef XP_PC printf("op_noacc: Test not valid on MS-Windows.\n\tNo concept of 'mode' on Open() call\n"); return(0); diff --git a/nsprpub/pr/tests/op_nofil.c b/nsprpub/pr/tests/op_nofil.c index 20bc11e1515..fa7ed6df7e2 100644 --- a/nsprpub/pr/tests/op_nofil.c +++ b/nsprpub/pr/tests/op_nofil.c @@ -56,12 +56,6 @@ #include #include "plgetopt.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#else -#endif - /* * A file name that cannot exist */ @@ -71,11 +65,6 @@ static PRFileDesc *t1; int main(int argc, char **argv) { - -#ifdef XP_MAC - SetupMacPrintfLog("pr_open_re.log"); -#endif - PR_STDIO_INIT(); t1 = PR_Open(NO_SUCH_FILE, PR_RDONLY, 0666); if (t1 == NULL) { diff --git a/nsprpub/pr/tests/perf.c b/nsprpub/pr/tests/perf.c index dda696820b4..4e2fc687c96 100644 --- a/nsprpub/pr/tests/perf.c +++ b/nsprpub/pr/tests/perf.c @@ -45,14 +45,7 @@ int _debug_on = 0; #define DPRINTF(arg) if (_debug_on) printf arg -#ifdef XP_MAC -#include "prlog.h" -#include "prsem.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif PRLock *lock; PRMonitor *mon; @@ -428,10 +421,6 @@ int main(int argc, char **argv) PR_UnblockClockInterrupts(); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("perf.log"); -#endif - lock = PR_NewLock(); mon = PR_NewMonitor(); mon2 = PR_NewMonitor(); diff --git a/nsprpub/pr/tests/poll_er.c b/nsprpub/pr/tests/poll_er.c index b68c798685c..4a3d9cbbb18 100644 --- a/nsprpub/pr/tests/poll_er.c +++ b/nsprpub/pr/tests/poll_er.c @@ -89,8 +89,6 @@ ClientThreadFunc(void *arg) soclose(PR_FileDesc2NativeHandle(badFD)); #elif defined(WIN32) || defined(WIN16) closesocket(PR_FileDesc2NativeHandle(badFD)); -#elif defined(XP_MAC) - _PR_MD_CLOSE_SOCKET(PR_FileDesc2NativeHandle(badFD)); #else #error "Unknown architecture" #endif diff --git a/nsprpub/pr/tests/poll_nm.c b/nsprpub/pr/tests/poll_nm.c index 05304beb243..b2000b77e4e 100644 --- a/nsprpub/pr/tests/poll_nm.c +++ b/nsprpub/pr/tests/poll_nm.c @@ -63,17 +63,9 @@ #include "prlog.h" #include "prprf.h" #include "prnetdb.h" -#ifndef XP_MAC #include "obsolete/probslet.h" -#else -#include "probslet.h" -#endif -#ifndef XP_MAC #include "private/pprio.h" -#else -#include "pprio.h" -#endif #include #include @@ -84,16 +76,6 @@ PRIntn debug_mode; #define NUM_ITERATIONS 5 -#ifdef XP_MAC -int fprintf(FILE *stream, const char *fmt, ...) -{ -PR_LogPrint(fmt); -return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static void PR_CALLBACK clientThreadFunc(void *arg) { @@ -166,11 +148,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - debug_mode = 1; - SetupMacPrintfLog("poll_nm.log"); -#endif - if (debug_mode) { printf("This program tests PR_Poll with sockets.\n"); printf("Normal operation are tested.\n\n"); diff --git a/nsprpub/pr/tests/poll_to.c b/nsprpub/pr/tests/poll_to.c index c9197ed9f80..e1a101fc3bd 100644 --- a/nsprpub/pr/tests/poll_to.c +++ b/nsprpub/pr/tests/poll_to.c @@ -64,11 +64,7 @@ #include "prprf.h" #include "prnetdb.h" -#ifndef XP_MAC #include "private/pprio.h" -#else -#include "pprio.h" -#endif #include #include diff --git a/nsprpub/pr/tests/priotest.c b/nsprpub/pr/tests/priotest.c index bff791c049d..e08fb8afd05 100644 --- a/nsprpub/pr/tests/priotest.c +++ b/nsprpub/pr/tests/priotest.c @@ -40,11 +40,6 @@ * Purpose: testing priorities */ -#ifdef XP_MAC -#error "This test does not run on Macintosh" -#else - - #include "prcmon.h" #include "prinit.h" #include "prinrval.h" @@ -228,6 +223,4 @@ int main(int argc, char **argv) } /* main */ -#endif /* ifdef XP_MAC */ - /* priotest.c */ diff --git a/nsprpub/pr/tests/provider.c b/nsprpub/pr/tests/provider.c index 4a1f2c7b956..0f5661598ff 100644 --- a/nsprpub/pr/tests/provider.c +++ b/nsprpub/pr/tests/provider.c @@ -82,16 +82,10 @@ #include #include - #if defined(XP_UNIX) #include #endif -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - /* ** This is the beginning of the test */ @@ -1203,10 +1197,6 @@ int main(int argc, char **argv) boolean = PR_SetLogFile("cltsrv.log"); MY_ASSERT(boolean); -#ifdef XP_MAC - debug_mode = PR_TRUE; -#endif - if (serverIsLocal) { /* Establish the server */ diff --git a/nsprpub/pr/tests/prpoll.c b/nsprpub/pr/tests/prpoll.c index 706ec1926b4..116a4842d90 100644 --- a/nsprpub/pr/tests/prpoll.c +++ b/nsprpub/pr/tests/prpoll.c @@ -49,11 +49,7 @@ #include "prprf.h" #include "prnetdb.h" -#ifndef XP_MAC #include "private/pprio.h" -#else -#include "pprio.h" -#endif #define CLIENT_LOOPS 5 #define BUF_SIZE 128 diff --git a/nsprpub/pr/tests/ranfile.c b/nsprpub/pr/tests/ranfile.c index 8fbc5854aad..c639382f4dc 100644 --- a/nsprpub/pr/tests/ranfile.c +++ b/nsprpub/pr/tests/ranfile.c @@ -97,12 +97,6 @@ static PRInt32 pageSize = 1024; static const char* baseName = "./"; static const char *programName = "Random File"; -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - /*********************************************************************** ** PRIVATE FUNCTION: RandomNum ** DESCRIPTION: @@ -328,11 +322,6 @@ int main(int argc, char **argv) interleave = PR_SecondsToInterval(10); -#ifdef XP_MAC - SetupMacPrintfLog("ranfile.log"); - debug_mode = 1; -#endif - ml = PR_NewLock(); cv = PR_NewCondVar(ml); diff --git a/nsprpub/lib/msgc/src/macgc.c b/nsprpub/pr/tests/reinit.c similarity index 65% rename from nsprpub/lib/msgc/src/macgc.c rename to nsprpub/pr/tests/reinit.c index eafc28e849a..8150021c80e 100644 --- a/nsprpub/lib/msgc/src/macgc.c +++ b/nsprpub/pr/tests/reinit.c @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -20,6 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Ludovico Cavedon * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -35,41 +36,33 @@ * * ***** END LICENSE BLOCK ***** */ -#include "primpl.h" -#include "MacMemAllocator.h" +/* This test verifies that NSPR can be cleaned up and reinitialized. */ -void _MD_InitGC() {} +#include "nspr.h" +#include -void *_MD_GrowGCHeap(size_t *sizep) +int main() { - void *heapPtr = NULL; - size_t heapSize = *sizep; - - // In previous versions of this code we tried to allocate GC heaps from the application - // heap. In the 4.0 application, we try to keep our app heap allications to a minimum - // and instead go through our own memory allocation routines. - heapPtr = malloc(heapSize); - - if (heapPtr == NULL) { - FreeMemoryStats stats; - - memtotal(heapSize, &stats); // How much can we allcoate? - - if (stats.maxBlockSize < heapSize) - heapSize = stats.maxBlockSize; - - heapPtr = malloc(heapSize); - - if (heapPtr == NULL) // Now we're hurting - heapSize = 0; - } - - *sizep = heapSize; - return heapPtr; -} + PRStatus rv; + fprintf(stderr, "Init 1\n"); + PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); + fprintf(stderr, "Cleanup 1\n"); + rv = PR_Cleanup(); + if (rv != PR_SUCCESS) { + fprintf(stderr, "FAIL\n"); + return 1; + } -void _MD_FreeGCSegment(void *base, int32 /* len */) -{ - free(base); + fprintf(stderr, "Init 2\n"); + PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); + fprintf(stderr, "Cleanup 2\n"); + rv = PR_Cleanup(); + if (rv != PR_SUCCESS) { + fprintf(stderr, "FAIL\n"); + return 1; + } + + fprintf(stderr, "PASS\n"); + return 0; } diff --git a/nsprpub/pr/tests/runtests.pl b/nsprpub/pr/tests/runtests.pl index 912c6301854..92da1d28e46 100755 --- a/nsprpub/pr/tests/runtests.pl +++ b/nsprpub/pr/tests/runtests.pl @@ -348,6 +348,7 @@ $prog = shift; # Program to test "prpollml", "ranfile", "randseed", +"reinit", "rwlocktest", "sel_spd", "selct_er", diff --git a/nsprpub/pr/tests/runtests.sh b/nsprpub/pr/tests/runtests.sh index a31b261e98b..1bfa8301bcc 100755 --- a/nsprpub/pr/tests/runtests.sh +++ b/nsprpub/pr/tests/runtests.sh @@ -176,6 +176,7 @@ provider prpollml ranfile randseed +reinit rwlocktest sel_spd selct_er diff --git a/nsprpub/pr/tests/sel_spd.c b/nsprpub/pr/tests/sel_spd.c index 72b85f82d6a..56388e6f854 100644 --- a/nsprpub/pr/tests/sel_spd.c +++ b/nsprpub/pr/tests/sel_spd.c @@ -51,17 +51,6 @@ #include #endif -#ifdef XP_MAC -#include "prlog.h" -int fprintf(FILE *stream, const char *fmt, ...) -{ -PR_LogPrint(fmt); -return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - #define PORT_BASE 19000 typedef struct timer_slot_t { @@ -76,13 +65,13 @@ typedef struct timer_slot_t { static long _iterations = 5; static long _client_data = 8192; -#if defined(XP_MAC) || defined(SYMBIAN) +#ifdef SYMBIAN /* - * Mac does not scale well specially the requirement for thread stack + * Symbian OS does not scale well specially the requirement for thread stack * space and buffer allocation space. It is easy to get into a fragmented * memory and not be able to allocate thread stack or client/server data * buffer. -*/ + */ static long _server_data = (8*1024); static long _threads_max = 10, _threads = 10; #else @@ -488,10 +477,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("sel_spd.log"); -#endif - fprintf(stdout, "Running test for %d iterations with %d simultaneous threads.\n", _iterations, _threads); fprintf(stdout, "\tWill send %d bytes of client data and %d bytes of server data\n", diff --git a/nsprpub/pr/tests/selct_er.c b/nsprpub/pr/tests/selct_er.c index e658813f6e7..2a5b8b24eee 100644 --- a/nsprpub/pr/tests/selct_er.c +++ b/nsprpub/pr/tests/selct_er.c @@ -200,8 +200,6 @@ int main(int argc, char **argv) soclose(PR_FileDesc2NativeHandle(badFD)); #elif defined(WIN32) || defined(WIN16) closesocket(PR_FileDesc2NativeHandle(badFD)); -#elif defined(XP_MAC) - _PR_MD_CLOSE_SOCKET(PR_FileDesc2NativeHandle(badFD)); #else #error "Unknown architecture" #endif diff --git a/nsprpub/pr/tests/selct_nm.c b/nsprpub/pr/tests/selct_nm.c index 56a80a76fb9..62927c90723 100644 --- a/nsprpub/pr/tests/selct_nm.c +++ b/nsprpub/pr/tests/selct_nm.c @@ -65,11 +65,7 @@ #include "prerror.h" #include "prnetdb.h" -#ifdef XP_MAC -#include "probslet.h" -#else #include "obsolete/probslet.h" -#endif #include #include diff --git a/nsprpub/pr/tests/selct_to.c b/nsprpub/pr/tests/selct_to.c index b5600fa9fe6..2a58d65bf61 100644 --- a/nsprpub/pr/tests/selct_to.c +++ b/nsprpub/pr/tests/selct_to.c @@ -64,11 +64,7 @@ #include "prprf.h" #include "prnetdb.h" -#ifdef XP_MAC -#include "probslet.h" -#else #include "obsolete/probslet.h" -#endif #include "prerror.h" diff --git a/nsprpub/pr/tests/sem.c b/nsprpub/pr/tests/sem.c index 09c9f3cde52..83e872cc89e 100644 --- a/nsprpub/pr/tests/sem.c +++ b/nsprpub/pr/tests/sem.c @@ -74,14 +74,7 @@ PRIntn debug_mode; #define SBSIZE 1024 -#ifdef XP_MAC -#include "prlog.h" -#include "prsem.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif static char stdinBuf[SBSIZE]; static char stdoutBuf[SBSIZE]; @@ -214,11 +207,6 @@ int main(int argc, char **argv) /* main test */ -#ifdef XP_MAC - SetupMacPrintfLog("sem.log"); - debug_mode = 1; -#endif - emptyBufs = PR_NewSem(2); /* two empty buffers */ fullBufs = PR_NewSem(0); /* zero full buffers */ diff --git a/nsprpub/pr/tests/socket.c b/nsprpub/pr/tests/socket.c index c3235d599fb..2acdd05ea3d 100644 --- a/nsprpub/pr/tests/socket.c +++ b/nsprpub/pr/tests/socket.c @@ -64,19 +64,7 @@ static int _debug_on = 0; static int test_cancelio = 0; -#ifdef XP_MAC -#include "prlog.h" -#include "prsem.h" -int fprintf(FILE *stream, const char *fmt, ...) -{ - PR_LogPrint(fmt); - return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif #ifdef XP_PC #define mode_t int @@ -129,16 +117,11 @@ char *LARGE_FILE_NAME = "/tmp/prsocket_test_dir/large_file"; #define NUM_TCP_CLIENTS 5 /* for a listen queue depth of 5 */ #define NUM_UDP_CLIENTS 10 -#ifndef XP_MAC #ifdef SYMBIAN #define NUM_TRANSMITFILE_CLIENTS 1 #else #define NUM_TRANSMITFILE_CLIENTS 4 #endif -#else -/* Mac can't handle more than 2* (3Mb) allocations for large file size buffers */ -#define NUM_TRANSMITFILE_CLIENTS 2 -#endif #define NUM_TCP_CONNECTIONS_PER_CLIENT 5 #define NUM_TCP_MESGS_PER_CONNECTION 10 @@ -1103,12 +1086,7 @@ UDP_Socket_Client_Server_Test(void) /* * Cause every other client thread to connect udp sockets */ -#ifndef XP_MAC cparamp->udp_connect = udp_connect; -#else - /* No support for UDP connects on Mac */ - cparamp->udp_connect = 0; -#endif if (udp_connect) udp_connect = 0; else @@ -2237,9 +2215,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("socket.log"); -#endif PR_SetConcurrency(4); emuSendFileIdentity = PR_GetUniqueIdentity("Emulated SendFile"); diff --git a/nsprpub/pr/tests/sockopt.c b/nsprpub/pr/tests/sockopt.c index 3765feac3a0..5c7a899e730 100644 --- a/nsprpub/pr/tests/sockopt.c +++ b/nsprpub/pr/tests/sockopt.c @@ -39,18 +39,13 @@ #include "prio.h" #include "prinit.h" #include "prprf.h" -#ifdef XP_MAC -#include "probslet.h" -#else #include "obsolete/probslet.h" -#endif #include "plerror.h" static PRFileDesc *err = NULL; static PRBool failed = PR_FALSE; -#ifndef XP_MAC static void Failed(const char *msg1, const char *msg2) { if (NULL != msg1) PR_fprintf(err, "%s ", msg1); @@ -58,19 +53,6 @@ static void Failed(const char *msg1, const char *msg2) failed = PR_TRUE; } /* Failed */ -#else -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -static void Failed(const char *msg1, const char *msg2) -{ - if (NULL != msg1) printf("%s ", msg1); - printf (msg2); - failed |= PR_TRUE; -} /* Failed */ - -#endif - static PRSockOption Incr(PRSockOption *option) { PRIntn val = ((PRIntn)*option) + 1; @@ -110,10 +92,6 @@ int main(int argc, char **argv) err = PR_GetSpecialFD(PR_StandardError); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("sockopt.log"); -#endif - if (NULL == udp) Failed("PR_NewUDPSocket()", NULL); else if (NULL == tcp) Failed("PR_NewTCPSocket()", NULL); else @@ -207,11 +185,7 @@ int main(int argc, char **argv) PR_Close(udp); PR_Close(tcp); } -#ifndef XP_MAC PR_fprintf(err, "%s\n", (failed) ? "FAILED" : "PASSED"); -#else - printf("%s\n", (failed) ? "FAILED" : "PASSED"); -#endif return (failed) ? 1 : 0; } /* main */ diff --git a/nsprpub/pr/tests/suspend.c b/nsprpub/pr/tests/suspend.c index d3cbc7f11b5..58a563b1f08 100644 --- a/nsprpub/pr/tests/suspend.c +++ b/nsprpub/pr/tests/suspend.c @@ -48,21 +48,10 @@ int main() #include "prpriv.h" #include "prinrval.h" -#if defined(XP_MAC) -#include "gcint.h" -#endif - #include #include #include -#ifdef XP_MAC -#include "gcint.h" -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - PRMonitor *mon; PRInt32 count; PRInt32 alive; @@ -201,10 +190,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("suspend.log"); -#endif - if (argc > 1) { count = atoi(argv[1]); } else { diff --git a/nsprpub/pr/tests/switch.c b/nsprpub/pr/tests/switch.c index 799812724e0..5c3211e6ae8 100644 --- a/nsprpub/pr/tests/switch.c +++ b/nsprpub/pr/tests/switch.c @@ -52,12 +52,7 @@ #include "plerror.h" #include "plgetopt.h" -#if defined(XP_MAC) -#include "pprio.h" -#define printf PR_LogPrint -#else #include "private/pprio.h" -#endif #include diff --git a/nsprpub/pr/tests/testfile.c b/nsprpub/pr/tests/testfile.c index b00dca991ee..f2fe4728828 100644 --- a/nsprpub/pr/tests/testfile.c +++ b/nsprpub/pr/tests/testfile.c @@ -61,14 +61,6 @@ static int _debug_on = 0; -#ifdef XP_MAC -#include "prlog.h" -#include "primpl.h" -#define printf PR_LogPrint -#define setbuf(x,y) -extern void SetupMacPrintfLog(char *logFile); -#endif - #ifdef WINCE #define setbuf(x,y) #endif @@ -687,14 +679,14 @@ HANDLE hfile; } PR_Close(fd_file); } -#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) +#if defined(XP_UNIX) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) /* * Create a hidden file - a platform-dependent operation */ strcpy(pathname, TEST_DIR); strcat(pathname, "/"); strcat(pathname, HIDDEN_FILE_NAME); -#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS) +#if defined(XP_UNIX) || defined(XP_BEOS) DPRINTF(("Creating hidden test file %s\n",pathname)); fd_file = PR_Open(pathname, PR_RDWR | PR_CREATE_FILE, 0777); @@ -705,56 +697,8 @@ HANDLE hfile; return -1; } -#if defined(XP_MAC) - { -#include - - OSErr err; - FCBPBRec fcbpb; - CInfoPBRec pb; - Str255 pascalMacPath; - - fcbpb.ioNamePtr = pascalMacPath; - fcbpb.ioVRefNum = 0; - fcbpb.ioRefNum = fd_file->secret->md.osfd; - fcbpb.ioFCBIndx = 0; - - err = PBGetFCBInfoSync(&fcbpb); - if (err != noErr) { - PR_Close(fd_file); - return -1; - } - - pb.hFileInfo.ioNamePtr = pascalMacPath; - pb.hFileInfo.ioVRefNum = fcbpb.ioFCBVRefNum; - pb.hFileInfo.ioDirID = fcbpb.ioFCBParID; - pb.hFileInfo.ioFDirIndex = 0; - - err = PBGetCatInfoSync(&pb); - if (err != noErr) { - PR_Close(fd_file); - return -1; - } - - pb.hFileInfo.ioNamePtr = pascalMacPath; - pb.hFileInfo.ioVRefNum = fcbpb.ioFCBVRefNum; - pb.hFileInfo.ioDirID = fcbpb.ioFCBParID; - pb.hFileInfo.ioFDirIndex = 0; - - pb.hFileInfo.ioFlFndrInfo.fdFlags |= fInvisible; - - err = PBSetCatInfoSync(&pb); - if (err != noErr) { - PR_Close(fd_file); - return -1; - } - - } -#endif - PR_Close(fd_file); - #elif defined(WINCE) DPRINTF(("Creating hidden test file %s\n",pathname)); MultiByteToWideChar(CP_ACP, 0, pathname, -1, wPathname, 256); @@ -796,9 +740,9 @@ HANDLE hfile; return -1; } PR_Close(fd_file); -#endif /* XP _UNIX || XP_MAC*/ +#endif /* XP_UNIX */ -#endif /* XP_UNIX || XP_MAC ||(XP_PC && WIN32) */ +#endif /* XP_UNIX || (XP_PC && WIN32) */ if (PR_FAILURE == PR_CloseDir(fd_dir)) @@ -820,7 +764,7 @@ HANDLE hfile; * List all files, including hidden files */ DPRINTF(("Listing all files in directory %s\n",TEST_DIR)); -#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) +#if defined(XP_UNIX) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) num_files = FILES_IN_DIR + 1; #else num_files = FILES_IN_DIR; @@ -856,7 +800,7 @@ HANDLE hfile; PR_CloseDir(fd_dir); -#if defined(XP_UNIX) || defined(XP_MAC) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) +#if defined(XP_UNIX) || (defined(XP_PC) && defined(WIN32)) || defined(XP_OS2) || defined(XP_BEOS) /* * List all files, except hidden files @@ -893,7 +837,7 @@ HANDLE hfile; } PR_CloseDir(fd_dir); -#endif /* XP_UNIX || XP_MAC || (XP_PC && WIN32) */ +#endif /* XP_UNIX || (XP_PC && WIN32) */ strcpy(renamename, TEST_DIR); strcat(renamename, ".RENAMED"); @@ -1000,10 +944,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("testfile.log"); -#endif - mon = PR_NewMonitor(); if (mon == NULL) { printf("testfile: PR_NewMonitor failed\n"); diff --git a/nsprpub/pr/tests/threads.c b/nsprpub/pr/tests/threads.c index e1d188d4c36..2a9df417cbe 100644 --- a/nsprpub/pr/tests/threads.c +++ b/nsprpub/pr/tests/threads.c @@ -43,12 +43,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - PRMonitor *mon; PRInt32 count, iterations, alive; @@ -200,17 +194,9 @@ int main(int argc, char **argv) PL_DestroyOptState(opt); } -#ifdef XP_MAC - SetupMacPrintfLog("threads.log"); - count = 10; - iterations = 10; - debug_mode = PR_TRUE; -#else if (0 == count) count = 50; if (0 == iterations) iterations = 10; -#endif - if (debug_mode) { printf("\ diff --git a/nsprpub/pr/tests/thrpool_client.c b/nsprpub/pr/tests/thrpool_client.c index 2acf24fd1cb..706f87ab273 100644 --- a/nsprpub/pr/tests/thrpool_client.c +++ b/nsprpub/pr/tests/thrpool_client.c @@ -65,19 +65,7 @@ static int _debug_on = 0; static int server_port = -1; static char *program_name = NULL; -#ifdef XP_MAC -#include "prlog.h" -#include "prsem.h" -int fprintf(FILE *stream, const char *fmt, ...) -{ - PR_LogPrint(fmt); - return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif #ifdef XP_PC #define mode_t int @@ -376,9 +364,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("socket.log"); -#endif PR_SetConcurrency(4); TCP_Socket_Client_Server_Test(); diff --git a/nsprpub/pr/tests/thrpool_server.c b/nsprpub/pr/tests/thrpool_server.c index e647186a536..64355543995 100644 --- a/nsprpub/pr/tests/thrpool_server.c +++ b/nsprpub/pr/tests/thrpool_server.c @@ -72,19 +72,7 @@ static int _debug_on = 0; static char *program_name = NULL; static void serve_client_write(void *arg); -#ifdef XP_MAC -#include "prlog.h" -#include "prsem.h" -int fprintf(FILE *stream, const char *fmt, ...) -{ - PR_LogPrint(fmt); - return 0; -} -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#else #include "obsolete/prsem.h" -#endif #ifdef XP_PC #define mode_t int @@ -581,9 +569,6 @@ int main(int argc, char **argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); PR_STDIO_INIT(); -#ifdef XP_MAC - SetupMacPrintfLog("socket.log"); -#endif PR_SetConcurrency(4); tp = PR_CreateThreadPool(initial_threads, max_threads, stacksize); diff --git a/nsprpub/pr/tests/timemac.c b/nsprpub/pr/tests/timemac.c index c58c24bdd3f..fd98a379676 100644 --- a/nsprpub/pr/tests/timemac.c +++ b/nsprpub/pr/tests/timemac.c @@ -43,12 +43,6 @@ #include "prinit.h" #include "prtime.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -extern void SetupMacPrintfLog(char *logFile); -#endif - static char *dayOfWeek[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "???" }; @@ -91,10 +85,6 @@ int main(int argc, char** argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); -#ifdef XP_MAC - SetupMacPrintfLog("timemac.log"); -#endif - /* ************************************************************* ** diff --git a/nsprpub/pr/tests/timetest.c b/nsprpub/pr/tests/timetest.c index c57c15e671f..d55a41b1a7e 100644 --- a/nsprpub/pr/tests/timetest.c +++ b/nsprpub/pr/tests/timetest.c @@ -53,12 +53,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#include "macstdlibextras.h" -extern void SetupMacPrintfLog(char *logFile); -#endif - int failed_already=0; PRBool debug_mode = PR_FALSE; @@ -206,11 +200,6 @@ int main(int argc, char** argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); -#ifdef XP_MAC - /* Set up the console */ - InitializeSIOUX(true); - debug_mode = PR_TRUE; -#endif /* Testing zero PRTime (the epoch) */ { PRTime t; @@ -776,16 +765,6 @@ int main(int argc, char** argv) } } -#ifdef XP_MAC - if (1) - { - char dummyChar; - - printf("Press return to exit\n\n"); - scanf("%c", &dummyChar); - } -#endif - if (failed_already) return 1; else return 0; diff --git a/nsprpub/pr/tests/tmoacc.c b/nsprpub/pr/tests/tmoacc.c index fa974a136a5..7ea6f0a982d 100644 --- a/nsprpub/pr/tests/tmoacc.c +++ b/nsprpub/pr/tests/tmoacc.c @@ -43,11 +43,6 @@ #include "plerror.h" #include "plgetopt.h" -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - #define BASE_PORT 9867 #define DEFAULT_THREADS 1 #define DEFAULT_BACKLOG 10 diff --git a/nsprpub/pr/tests/tmocon.c b/nsprpub/pr/tests/tmocon.c index b762e451ef1..0326e2d78b0 100644 --- a/nsprpub/pr/tests/tmocon.c +++ b/nsprpub/pr/tests/tmocon.c @@ -72,11 +72,6 @@ #include #endif -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - #define BASE_PORT 9867 diff --git a/nsprpub/pr/tests/tpd.c b/nsprpub/pr/tests/tpd.c index 6db204cea4b..4cbce5af43f 100644 --- a/nsprpub/pr/tests/tpd.c +++ b/nsprpub/pr/tests/tpd.c @@ -47,11 +47,7 @@ #include "prthread.h" #include "prtypes.h" -#if defined(XP_MAC) -#include "pprio.h" -#else #include "private/pprio.h" -#endif #include "plgetopt.h" diff --git a/nsprpub/pr/tests/udpsrv.c b/nsprpub/pr/tests/udpsrv.c index b9b615a2490..bf497a90904 100644 --- a/nsprpub/pr/tests/udpsrv.c +++ b/nsprpub/pr/tests/udpsrv.c @@ -495,10 +495,6 @@ int main(int argc, char **argv) PR_STDIO_INIT(); output = PR_STDERR; -#ifdef XP_MAC - SetupMacPrintfLog("udpsrv.log"); -#endif - PR_SetConcurrency(4); /* diff --git a/nsprpub/pr/tests/writev.c b/nsprpub/pr/tests/writev.c index 603526c9f16..26e52480ba1 100644 --- a/nsprpub/pr/tests/writev.c +++ b/nsprpub/pr/tests/writev.c @@ -42,11 +42,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#define printf PR_LogPrint -#endif - #ifndef IOV_MAX #define IOV_MAX 16 diff --git a/nsprpub/pr/tests/y2k.c b/nsprpub/pr/tests/y2k.c index 80fc10a54f7..68ee245a77e 100644 --- a/nsprpub/pr/tests/y2k.c +++ b/nsprpub/pr/tests/y2k.c @@ -56,12 +56,6 @@ #include #include -#ifdef XP_MAC -#include "prlog.h" -#include "macstdlibextras.h" -extern void SetupMacPrintfLog(char *logFile); -#endif - #define PRINT_DETAILS int failed_already=0; @@ -792,12 +786,6 @@ int main(int argc, char** argv) PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0); lm = PR_NewLogModule("test"); -#ifdef XP_MAC - /* Set up the console */ - InitializeSIOUX(true); - debug_mode = PR_TRUE; -#endif - if ( PR_FAILURE == TestExplodeImplodeTime()) { PR_LOG( lm, PR_LOG_ERROR, @@ -822,16 +810,6 @@ int main(int argc, char** argv) else printf("Test 3: Parse Time Test passed\n"); -#ifdef XP_MAC - if (1) - { - char dummyChar; - - printf("Press return to exit\n\n"); - scanf("%c", &dummyChar); - } -#endif - if (failed_already) return 1; else