From 78088f689bafcfb45383f506809609c6cdb85fc4 Mon Sep 17 00:00:00 2001 From: Michael Demeter Date: Mon, 19 Aug 2013 14:54:38 -0700 Subject: [PATCH] Imported Upstream version 4.10 --- mozilla/CVS/Entries | 1 - mozilla/CVS/Entries.Static | 0 mozilla/CVS/Repository | 1 - mozilla/CVS/Root | 1 - mozilla/CVS/Tag | 1 - mozilla/nsprpub/CVS/Entries | 15 - mozilla/nsprpub/CVS/Repository | 1 - mozilla/nsprpub/CVS/Root | 1 - mozilla/nsprpub/CVS/Tag | 1 - mozilla/nsprpub/admin/CVS/Entries | 5 - mozilla/nsprpub/admin/CVS/Repository | 1 - mozilla/nsprpub/admin/CVS/Root | 1 - mozilla/nsprpub/admin/CVS/Tag | 1 - mozilla/nsprpub/admin/repackage.sh | 179 -------- mozilla/nsprpub/build/CVS/Entries | 3 - mozilla/nsprpub/build/CVS/Repository | 1 - mozilla/nsprpub/build/CVS/Root | 1 - mozilla/nsprpub/build/CVS/Tag | 1 - mozilla/nsprpub/build/autoconf/CVS/Entries | 5 - mozilla/nsprpub/build/autoconf/CVS/Repository | 1 - mozilla/nsprpub/build/autoconf/CVS/Root | 1 - mozilla/nsprpub/build/autoconf/CVS/Tag | 1 - mozilla/nsprpub/build/win32/CVS/Entries | 2 - mozilla/nsprpub/build/win32/CVS/Repository | 1 - mozilla/nsprpub/build/win32/CVS/Root | 1 - mozilla/nsprpub/build/win32/CVS/Tag | 1 - mozilla/nsprpub/config/CVS/Entries | 20 - mozilla/nsprpub/config/CVS/Repository | 1 - mozilla/nsprpub/config/CVS/Root | 1 - mozilla/nsprpub/config/CVS/Tag | 1 - mozilla/nsprpub/include/CVS/Entries | 1 - mozilla/nsprpub/include/CVS/Repository | 1 - mozilla/nsprpub/include/CVS/Root | 1 - mozilla/nsprpub/include/CVS/Tag | 1 - mozilla/nsprpub/lib/CVS/Entries | 7 - mozilla/nsprpub/lib/CVS/Repository | 1 - mozilla/nsprpub/lib/CVS/Root | 1 - mozilla/nsprpub/lib/CVS/Tag | 1 - mozilla/nsprpub/lib/ds/CVS/Entries | 11 - mozilla/nsprpub/lib/ds/CVS/Repository | 1 - mozilla/nsprpub/lib/ds/CVS/Root | 1 - mozilla/nsprpub/lib/ds/CVS/Tag | 1 - mozilla/nsprpub/lib/libc/CVS/Entries | 5 - mozilla/nsprpub/lib/libc/CVS/Repository | 1 - mozilla/nsprpub/lib/libc/CVS/Root | 1 - mozilla/nsprpub/lib/libc/CVS/Tag | 1 - mozilla/nsprpub/lib/libc/include/CVS/Entries | 8 - mozilla/nsprpub/lib/libc/include/CVS/Repository | 1 - mozilla/nsprpub/lib/libc/include/CVS/Root | 1 - mozilla/nsprpub/lib/libc/include/CVS/Tag | 1 - mozilla/nsprpub/lib/libc/src/CVS/Entries | 20 - mozilla/nsprpub/lib/libc/src/CVS/Repository | 1 - mozilla/nsprpub/lib/libc/src/CVS/Root | 1 - mozilla/nsprpub/lib/libc/src/CVS/Tag | 1 - mozilla/nsprpub/lib/msgc/CVS/Entries | 3 - mozilla/nsprpub/lib/msgc/CVS/Repository | 1 - mozilla/nsprpub/lib/msgc/CVS/Root | 1 - mozilla/nsprpub/lib/msgc/CVS/Tag | 1 - mozilla/nsprpub/lib/msgc/include/CVS/Entries | 1 - mozilla/nsprpub/lib/msgc/include/CVS/Repository | 1 - mozilla/nsprpub/lib/msgc/include/CVS/Root | 1 - mozilla/nsprpub/lib/msgc/include/CVS/Tag | 1 - mozilla/nsprpub/lib/msgc/src/CVS/Entries | 1 - mozilla/nsprpub/lib/msgc/src/CVS/Repository | 1 - mozilla/nsprpub/lib/msgc/src/CVS/Root | 1 - mozilla/nsprpub/lib/msgc/src/CVS/Tag | 1 - mozilla/nsprpub/lib/msgc/tests/CVS/Entries | 1 - mozilla/nsprpub/lib/msgc/tests/CVS/Repository | 1 - mozilla/nsprpub/lib/msgc/tests/CVS/Root | 1 - mozilla/nsprpub/lib/msgc/tests/CVS/Tag | 1 - mozilla/nsprpub/lib/prstreams/CVS/Entries | 7 - mozilla/nsprpub/lib/prstreams/CVS/Repository | 1 - mozilla/nsprpub/lib/prstreams/CVS/Root | 1 - mozilla/nsprpub/lib/prstreams/CVS/Tag | 1 - mozilla/nsprpub/lib/prstreams/tests/CVS/Entries | 1 - mozilla/nsprpub/lib/prstreams/tests/CVS/Repository | 1 - mozilla/nsprpub/lib/prstreams/tests/CVS/Root | 1 - mozilla/nsprpub/lib/prstreams/tests/CVS/Tag | 1 - .../lib/prstreams/tests/testprstrm/CVS/Entries | 4 - .../lib/prstreams/tests/testprstrm/CVS/Repository | 1 - .../lib/prstreams/tests/testprstrm/CVS/Root | 1 - .../nsprpub/lib/prstreams/tests/testprstrm/CVS/Tag | 1 - mozilla/nsprpub/lib/tests/CVS/Entries | 7 - mozilla/nsprpub/lib/tests/CVS/Repository | 1 - mozilla/nsprpub/lib/tests/CVS/Root | 1 - mozilla/nsprpub/lib/tests/CVS/Tag | 1 - mozilla/nsprpub/lib/tests/windows/CVS/Entries | 1 - mozilla/nsprpub/lib/tests/windows/CVS/Repository | 1 - mozilla/nsprpub/lib/tests/windows/CVS/Root | 1 - mozilla/nsprpub/lib/tests/windows/CVS/Tag | 1 - mozilla/nsprpub/macbuild/CVS/Entries | 1 - mozilla/nsprpub/macbuild/CVS/Repository | 1 - mozilla/nsprpub/macbuild/CVS/Root | 1 - mozilla/nsprpub/macbuild/CVS/Tag | 1 - mozilla/nsprpub/pkg/CVS/Entries | 3 - mozilla/nsprpub/pkg/CVS/Repository | 1 - mozilla/nsprpub/pkg/CVS/Root | 1 - mozilla/nsprpub/pkg/CVS/Tag | 1 - mozilla/nsprpub/pkg/linux/CVS/Entries | 3 - mozilla/nsprpub/pkg/linux/CVS/Repository | 1 - mozilla/nsprpub/pkg/linux/CVS/Root | 1 - mozilla/nsprpub/pkg/linux/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/CVS/Entries | 16 - mozilla/nsprpub/pkg/solaris/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries | 1 - .../nsprpub/pkg/solaris/SUNWnspr/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries | 1 - .../nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Tag | 1 - .../nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries | 1 - .../nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Entries | 7 - mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Entries | 5 - mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries | 1 - .../nsprpub/pkg/solaris/SUNWprdx/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Tag | 1 - .../nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries | 1 - .../pkg/solaris/SUNWprx-devl/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Tag | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Entries | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Tag | 1 - .../nsprpub/pkg/solaris/common_files/CVS/Entries | 2 - .../pkg/solaris/common_files/CVS/Repository | 1 - mozilla/nsprpub/pkg/solaris/common_files/CVS/Root | 1 - mozilla/nsprpub/pkg/solaris/common_files/CVS/Tag | 1 - mozilla/nsprpub/pr/CVS/Entries | 5 - mozilla/nsprpub/pr/CVS/Repository | 1 - mozilla/nsprpub/pr/CVS/Root | 1 - mozilla/nsprpub/pr/CVS/Tag | 1 - mozilla/nsprpub/pr/include/CVS/Entries | 46 -- mozilla/nsprpub/pr/include/CVS/Repository | 1 - mozilla/nsprpub/pr/include/CVS/Root | 1 - mozilla/nsprpub/pr/include/CVS/Tag | 1 - mozilla/nsprpub/pr/include/md/CVS/Entries | 72 --- mozilla/nsprpub/pr/include/md/CVS/Repository | 1 - mozilla/nsprpub/pr/include/md/CVS/Root | 1 - mozilla/nsprpub/pr/include/md/CVS/Tag | 1 - mozilla/nsprpub/pr/include/md/_ncr.cfg | 108 ----- mozilla/nsprpub/pr/include/md/_ncr.h | 198 --------- mozilla/nsprpub/pr/include/md/_nec.cfg | 108 ----- mozilla/nsprpub/pr/include/md/_nec.h | 164 ------- mozilla/nsprpub/pr/include/md/_nextstep.cfg | 223 ---------- mozilla/nsprpub/pr/include/md/_nextstep.h | 267 ----------- mozilla/nsprpub/pr/include/md/_reliantunix.cfg | 113 ----- mozilla/nsprpub/pr/include/md/_reliantunix.h | 238 ---------- mozilla/nsprpub/pr/include/md/_sony.cfg | 108 ----- mozilla/nsprpub/pr/include/md/_sony.h | 172 -------- mozilla/nsprpub/pr/include/md/_sunos4.cfg | 106 ----- mozilla/nsprpub/pr/include/md/_sunos4.h | 204 --------- mozilla/nsprpub/pr/include/md/sunos4.h | 132 ------ mozilla/nsprpub/pr/include/obsolete/CVS/Entries | 7 - mozilla/nsprpub/pr/include/obsolete/CVS/Repository | 1 - mozilla/nsprpub/pr/include/obsolete/CVS/Root | 1 - mozilla/nsprpub/pr/include/obsolete/CVS/Tag | 1 - mozilla/nsprpub/pr/include/private/CVS/Entries | 8 - mozilla/nsprpub/pr/include/private/CVS/Repository | 1 - mozilla/nsprpub/pr/include/private/CVS/Root | 1 - mozilla/nsprpub/pr/include/private/CVS/Tag | 1 - mozilla/nsprpub/pr/src/CVS/Entries | 17 - mozilla/nsprpub/pr/src/CVS/Repository | 1 - mozilla/nsprpub/pr/src/CVS/Root | 1 - mozilla/nsprpub/pr/src/CVS/Tag | 1 - mozilla/nsprpub/pr/src/bthreads/CVS/Entries | 11 - mozilla/nsprpub/pr/src/bthreads/CVS/Repository | 1 - mozilla/nsprpub/pr/src/bthreads/CVS/Root | 1 - mozilla/nsprpub/pr/src/bthreads/CVS/Tag | 1 - mozilla/nsprpub/pr/src/cplus/CVS/Entries | 25 -- mozilla/nsprpub/pr/src/cplus/CVS/Repository | 1 - mozilla/nsprpub/pr/src/cplus/CVS/Root | 1 - mozilla/nsprpub/pr/src/cplus/CVS/Tag | 1 - mozilla/nsprpub/pr/src/cplus/tests/CVS/Entries | 10 - mozilla/nsprpub/pr/src/cplus/tests/CVS/Repository | 1 - mozilla/nsprpub/pr/src/cplus/tests/CVS/Root | 1 - mozilla/nsprpub/pr/src/cplus/tests/CVS/Tag | 1 - mozilla/nsprpub/pr/src/cthreads/CVS/Entries | 1 - mozilla/nsprpub/pr/src/cthreads/CVS/Repository | 1 - mozilla/nsprpub/pr/src/cthreads/CVS/Root | 1 - mozilla/nsprpub/pr/src/cthreads/CVS/Tag | 1 - mozilla/nsprpub/pr/src/io/CVS/Entries | 19 - mozilla/nsprpub/pr/src/io/CVS/Repository | 1 - mozilla/nsprpub/pr/src/io/CVS/Root | 1 - mozilla/nsprpub/pr/src/io/CVS/Tag | 1 - mozilla/nsprpub/pr/src/linking/CVS/Entries | 4 - mozilla/nsprpub/pr/src/linking/CVS/Repository | 1 - mozilla/nsprpub/pr/src/linking/CVS/Root | 1 - mozilla/nsprpub/pr/src/linking/CVS/Tag | 1 - mozilla/nsprpub/pr/src/malloc/CVS/Entries | 5 - mozilla/nsprpub/pr/src/malloc/CVS/Repository | 1 - mozilla/nsprpub/pr/src/malloc/CVS/Root | 1 - mozilla/nsprpub/pr/src/malloc/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/CVS/Entries | 8 - mozilla/nsprpub/pr/src/md/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/beos/CVS/Entries | 17 - mozilla/nsprpub/pr/src/md/beos/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/beos/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/beos/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/mac/CVS/Entries | 1 - mozilla/nsprpub/pr/src/md/mac/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/mac/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/mac/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/os2/CVS/Entries | 17 - mozilla/nsprpub/pr/src/md/os2/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/os2/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/os2/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/unix/CVS/Entries | 55 --- mozilla/nsprpub/pr/src/md/unix/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/unix/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/unix/CVS/Tag | 1 - mozilla/nsprpub/pr/src/md/unix/ncr.c | 363 --------------- mozilla/nsprpub/pr/src/md/unix/nec.c | 68 --- mozilla/nsprpub/pr/src/md/unix/nextstep.c | 252 ----------- mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s | 96 ---- mozilla/nsprpub/pr/src/md/unix/reliantunix.c | 101 ----- mozilla/nsprpub/pr/src/md/unix/sony.c | 77 ---- mozilla/nsprpub/pr/src/md/unix/sunos4.c | 64 --- mozilla/nsprpub/pr/src/md/windows/CVS/Entries | 22 - mozilla/nsprpub/pr/src/md/windows/CVS/Repository | 1 - mozilla/nsprpub/pr/src/md/windows/CVS/Root | 1 - mozilla/nsprpub/pr/src/md/windows/CVS/Tag | 1 - mozilla/nsprpub/pr/src/memory/CVS/Entries | 6 - mozilla/nsprpub/pr/src/memory/CVS/Repository | 1 - mozilla/nsprpub/pr/src/memory/CVS/Root | 1 - mozilla/nsprpub/pr/src/memory/CVS/Tag | 1 - mozilla/nsprpub/pr/src/misc/CVS/Entries | 30 -- mozilla/nsprpub/pr/src/misc/CVS/Repository | 1 - mozilla/nsprpub/pr/src/misc/CVS/Root | 1 - mozilla/nsprpub/pr/src/misc/CVS/Tag | 1 - mozilla/nsprpub/pr/src/pthreads/CVS/Entries | 7 - mozilla/nsprpub/pr/src/pthreads/CVS/Repository | 1 - mozilla/nsprpub/pr/src/pthreads/CVS/Root | 1 - mozilla/nsprpub/pr/src/pthreads/CVS/Tag | 1 - mozilla/nsprpub/pr/src/threads/CVS/Entries | 10 - mozilla/nsprpub/pr/src/threads/CVS/Repository | 1 - mozilla/nsprpub/pr/src/threads/CVS/Root | 1 - mozilla/nsprpub/pr/src/threads/CVS/Tag | 1 - .../nsprpub/pr/src/threads/combined/CVS/Entries | 9 - .../nsprpub/pr/src/threads/combined/CVS/Repository | 1 - mozilla/nsprpub/pr/src/threads/combined/CVS/Root | 1 - mozilla/nsprpub/pr/src/threads/combined/CVS/Tag | 1 - mozilla/nsprpub/pr/tests/CVS/Entries | 177 -------- mozilla/nsprpub/pr/tests/CVS/Repository | 1 - mozilla/nsprpub/pr/tests/CVS/Root | 1 - mozilla/nsprpub/pr/tests/CVS/Tag | 1 - mozilla/nsprpub/pr/tests/dll/CVS/Entries | 6 - mozilla/nsprpub/pr/tests/dll/CVS/Repository | 1 - mozilla/nsprpub/pr/tests/dll/CVS/Root | 1 - mozilla/nsprpub/pr/tests/dll/CVS/Tag | 1 - mozilla/nsprpub/pr/tests/macbuild/CVS/Entries | 1 - mozilla/nsprpub/pr/tests/macbuild/CVS/Repository | 1 - mozilla/nsprpub/pr/tests/macbuild/CVS/Root | 1 - mozilla/nsprpub/pr/tests/macbuild/CVS/Tag | 1 - mozilla/nsprpub/pr/tests/w16gui/CVS/Entries | 1 - mozilla/nsprpub/pr/tests/w16gui/CVS/Repository | 1 - mozilla/nsprpub/pr/tests/w16gui/CVS/Root | 1 - mozilla/nsprpub/pr/tests/w16gui/CVS/Tag | 1 - mozilla/nsprpub/tools/CVS/Entries | 5 - mozilla/nsprpub/tools/CVS/Repository | 1 - mozilla/nsprpub/tools/CVS/Root | 1 - mozilla/nsprpub/tools/CVS/Tag | 1 - {mozilla/nsprpub => nspr}/.cvsignore | 0 nspr/.hg_archival.txt | 5 + nspr/.hgignore | 5 + {mozilla/nsprpub => nspr}/LICENSE | 0 {mozilla/nsprpub => nspr}/Makefile.in | 0 {mozilla/nsprpub => nspr}/aclocal.m4 | 0 {mozilla/nsprpub => nspr}/admin/explode.pl | 0 {mozilla/nsprpub => nspr}/admin/makeTargetDirs.sh | 0 {mozilla/nsprpub => nspr}/admin/symlinks.sh | 0 .../nsprpub => nspr}/build/autoconf/acwinpaths.m4 | 0 .../nsprpub => nspr}/build/autoconf/config.guess | 0 .../nsprpub => nspr}/build/autoconf/config.sub | 0 .../nsprpub => nspr}/build/autoconf/install-sh | 0 {mozilla/nsprpub => nspr}/build/cygwin-wrapper | 0 {mozilla/nsprpub => nspr}/build/win32/pgomerge.py | 0 {mozilla/nsprpub => nspr}/config/.cvsignore | 0 {mozilla/nsprpub => nspr}/config/Makefile.in | 2 +- {mozilla/nsprpub => nspr}/config/autoconf.mk.in | 0 {mozilla/nsprpub => nspr}/config/config.mk | 0 {mozilla/nsprpub => nspr}/config/gcc_hidden.h | 0 {mozilla/nsprpub => nspr}/config/libc_r.h | 0 .../config/make-system-wrappers.pl | 0 {mozilla/nsprpub => nspr}/config/nfspwd.pl | 0 {mozilla/nsprpub => nspr}/config/now.c | 0 {mozilla/nsprpub => nspr}/config/nsinstall.c | 32 +- {mozilla/nsprpub => nspr}/config/nspr-config.in | 0 {mozilla/nsprpub => nspr}/config/nspr.m4 | 0 {mozilla/nsprpub => nspr}/config/nspr.pc.in | 0 {mozilla/nsprpub => nspr}/config/nsprincl.mk.in | 0 {mozilla/nsprpub => nspr}/config/nsprincl.sh.in | 0 {mozilla/nsprpub => nspr}/config/pathsub.h | 4 - {mozilla/nsprpub => nspr}/config/prdepend.h | 1 + {mozilla/nsprpub => nspr}/config/rules.mk | 0 {mozilla/nsprpub => nspr}/config/system-headers | 0 {mozilla/nsprpub => nspr}/configure | 488 ++++++--------------- {mozilla/nsprpub => nspr}/configure.in | 176 ++------ {mozilla/nsprpub/tools => nspr/lib}/.cvsignore | 0 {mozilla/nsprpub => nspr}/lib/Makefile.in | 0 .../lib/libc/src => nspr/lib/ds}/.cvsignore | 0 {mozilla/nsprpub => nspr}/lib/ds/Makefile.in | 5 +- {mozilla/nsprpub => nspr}/lib/ds/plarena.c | 22 +- {mozilla/nsprpub => nspr}/lib/ds/plarena.h | 84 +++- {mozilla/nsprpub => nspr}/lib/ds/plarenas.h | 16 + {mozilla/nsprpub => nspr}/lib/ds/plds.def | 4 + {mozilla/nsprpub => nspr}/lib/ds/plds.rc | 0 {mozilla/nsprpub => nspr}/lib/ds/plhash.c | 0 {mozilla/nsprpub => nspr}/lib/ds/plhash.h | 0 {mozilla/nsprpub => nspr}/lib/ds/plvrsion.c | 0 .../pr/tests/dll => nspr/lib/libc}/.cvsignore | 0 {mozilla/nsprpub => nspr}/lib/libc/Makefile.in | 0 .../nsprpub/lib/libc/src => nspr/lib/libc}/README | 0 .../pr/tests => nspr/lib/libc/include}/.cvsignore | 0 .../nsprpub => nspr}/lib/libc/include/Makefile.in | 0 {mozilla/nsprpub => nspr}/lib/libc/include/README | 0 .../nsprpub => nspr}/lib/libc/include/plbase64.h | 0 .../nsprpub => nspr}/lib/libc/include/plerror.h | 0 .../nsprpub => nspr}/lib/libc/include/plgetopt.h | 0 {mozilla/nsprpub => nspr}/lib/libc/include/plstr.h | 0 .../lib/ds => nspr/lib/libc/src}/.cvsignore | 0 {mozilla/nsprpub => nspr}/lib/libc/src/Makefile.in | 5 +- .../nsprpub/lib/libc => nspr/lib/libc/src}/README | 0 {mozilla/nsprpub => nspr}/lib/libc/src/base64.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/plc.def | 0 {mozilla/nsprpub => nspr}/lib/libc/src/plc.rc | 0 {mozilla/nsprpub => nspr}/lib/libc/src/plerror.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/plgetopt.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/plvrsion.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strcase.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strcat.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strchr.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strcmp.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strcpy.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strdup.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strlen.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strpbrk.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strstr.c | 0 {mozilla/nsprpub => nspr}/lib/libc/src/strtok.c | 0 .../combined => nspr/lib/prstreams}/.cvsignore | 0 .../nsprpub => nspr}/lib/prstreams/Makefile.in | 5 +- {mozilla/nsprpub => nspr}/lib/prstreams/plvrsion.c | 0 .../nsprpub => nspr}/lib/prstreams/prstrms.cpp | 0 {mozilla/nsprpub => nspr}/lib/prstreams/prstrms.h | 0 {mozilla/nsprpub => nspr}/lib/prstreams/prstrms.rc | 0 .../lib/prstreams/tests/testprstrm}/.cvsignore | 0 .../lib/prstreams/tests/testprstrm/Makefile.in | 20 - .../lib/prstreams/tests/testprstrm/testprstrm.cpp | 0 .../pr/src/pthreads => nspr/lib/tests}/.cvsignore | 0 {mozilla/nsprpub => nspr}/lib/tests/Makefile.in | 13 - {mozilla/nsprpub => nspr}/lib/tests/arena.c | 0 {mozilla/nsprpub => nspr}/lib/tests/base64t.c | 0 {mozilla/nsprpub => nspr}/lib/tests/getopt.c | 0 {mozilla/nsprpub => nspr}/lib/tests/string.c | 0 {mozilla/nsprpub => nspr}/pkg/Makefile.in | 0 {mozilla/nsprpub => nspr}/pkg/linux/Makefile.in | 2 +- {mozilla/nsprpub => nspr}/pkg/linux/sun-nspr.spec | 0 .../nsprpub => nspr}/pkg/solaris/Makefile-devl.com | 2 +- .../pkg/solaris/Makefile-devl.targ | 2 +- {mozilla/nsprpub => nspr}/pkg/solaris/Makefile.com | 2 +- {mozilla/nsprpub => nspr}/pkg/solaris/Makefile.in | 2 +- .../nsprpub => nspr}/pkg/solaris/Makefile.targ | 2 +- .../pkg/solaris/SUNWpr/Makefile.in | 2 +- .../nsprpub => nspr}/pkg/solaris/SUNWpr/depend | 2 +- .../pkg/solaris/SUNWpr/pkginfo.tmpl | 2 +- .../pkg/solaris/SUNWpr/prototype_com | 2 +- .../pkg/solaris/SUNWpr/prototype_i386 | 2 +- .../pkg/solaris/SUNWpr/prototype_sparc | 2 +- .../pkg/solaris/SUNWprd/Makefile.in | 2 +- .../nsprpub => nspr}/pkg/solaris/SUNWprd/depend | 2 +- .../pkg/solaris/SUNWprd/pkginfo.tmpl | 2 +- .../nsprpub => nspr}/pkg/solaris/SUNWprd/prototype | 2 +- .../pkg/solaris/bld_awk_pkginfo.ksh | 2 +- .../pkg/solaris/common_files/copyright | 0 {mozilla/nsprpub => nspr}/pkg/solaris/proto64.mk | 2 +- .../nsprpub/pr/src/misc => nspr/pr}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/Makefile.in | 0 .../pr/src/memory => nspr/pr/include}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/include/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/include/gencfg.c | 14 +- .../md/windows => nspr/pr/include/md}/.cvsignore | 0 .../nsprpub => nspr}/pr/include/md/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/include/md/_aix.h | 5 +- {mozilla/nsprpub => nspr}/pr/include/md/_aix32.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_aix64.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_beos.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_beos.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_bsdi.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_bsdi.h | 3 +- .../nsprpub => nspr}/pr/include/md/_darwin.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_darwin.h | 10 +- {mozilla/nsprpub => nspr}/pr/include/md/_dgux.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_dgux.h | 3 +- .../nsprpub => nspr}/pr/include/md/_freebsd.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_freebsd.h | 5 +- {mozilla/nsprpub => nspr}/pr/include/md/_hpux.h | 3 +- .../nsprpub => nspr}/pr/include/md/_hpux32.cfg | 0 .../nsprpub => nspr}/pr/include/md/_hpux64.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_irix.h | 0 .../nsprpub => nspr}/pr/include/md/_irix32.cfg | 0 .../nsprpub => nspr}/pr/include/md/_irix64.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_linux.cfg | 102 +++++ {mozilla/nsprpub => nspr}/pr/include/md/_linux.h | 13 +- .../nsprpub => nspr}/pr/include/md/_netbsd.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_netbsd.h | 5 +- .../nsprpub => nspr}/pr/include/md/_nspr_pthread.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_nto.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_nto.h | 3 +- .../nsprpub => nspr}/pr/include/md/_openbsd.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_openbsd.h | 3 +- {mozilla/nsprpub => nspr}/pr/include/md/_os2.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_os2.h | 0 .../nsprpub => nspr}/pr/include/md/_os2_errors.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_osf1.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_osf1.h | 3 +- {mozilla/nsprpub => nspr}/pr/include/md/_pcos.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_pth.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_qnx.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_qnx.h | 3 +- .../nsprpub => nspr}/pr/include/md/_riscos.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_riscos.h | 3 +- {mozilla/nsprpub => nspr}/pr/include/md/_scoos.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_scoos.h | 3 +- .../nsprpub => nspr}/pr/include/md/_solaris.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_solaris.h | 8 +- .../nsprpub => nspr}/pr/include/md/_symbian.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_symbian.h | 5 +- .../nsprpub => nspr}/pr/include/md/_unix_errors.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_unixos.h | 19 +- .../nsprpub => nspr}/pr/include/md/_unixware.cfg | 0 .../nsprpub => nspr}/pr/include/md/_unixware.h | 3 +- .../nsprpub => nspr}/pr/include/md/_unixware7.cfg | 0 .../nsprpub => nspr}/pr/include/md/_win32_errors.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/_win95.cfg | 8 +- {mozilla/nsprpub => nspr}/pr/include/md/_win95.h | 7 +- {mozilla/nsprpub => nspr}/pr/include/md/_winnt.cfg | 0 {mozilla/nsprpub => nspr}/pr/include/md/_winnt.h | 0 {mozilla/nsprpub => nspr}/pr/include/md/prosdep.h | 18 - {mozilla/nsprpub => nspr}/pr/include/nspr.h | 0 .../unix => nspr/pr/include/obsolete}/.cvsignore | 0 .../pr/include/obsolete/Makefile.in | 0 .../nsprpub => nspr}/pr/include/obsolete/pralarm.h | 0 .../pr/include/obsolete/probslet.h | 0 .../pr/include/obsolete/protypes.h | 0 .../nsprpub => nspr}/pr/include/obsolete/prsem.h | 0 {mozilla/nsprpub => nspr}/pr/include/pratom.h | 0 {mozilla/nsprpub => nspr}/pr/include/prbit.h | 10 +- {mozilla/nsprpub => nspr}/pr/include/prclist.h | 0 {mozilla/nsprpub => nspr}/pr/include/prcmon.h | 0 {mozilla/nsprpub => nspr}/pr/include/prcountr.h | 0 {mozilla/nsprpub => nspr}/pr/include/prcvar.h | 0 {mozilla/nsprpub => nspr}/pr/include/prdtoa.h | 0 {mozilla/nsprpub => nspr}/pr/include/prenv.h | 0 {mozilla/nsprpub => nspr}/pr/include/prerr.h | 0 {mozilla/nsprpub => nspr}/pr/include/prerror.h | 0 {mozilla/nsprpub => nspr}/pr/include/prinet.h | 0 {mozilla/nsprpub => nspr}/pr/include/prinit.h | 6 +- {mozilla/nsprpub => nspr}/pr/include/prinrval.h | 0 {mozilla/nsprpub => nspr}/pr/include/prio.h | 0 {mozilla/nsprpub => nspr}/pr/include/pripcsem.h | 0 .../md/os2 => nspr/pr/include/private}/.cvsignore | 0 .../pr/include/private/Makefile.in | 0 .../nsprpub => nspr}/pr/include/private/pprio.h | 0 .../nsprpub => nspr}/pr/include/private/pprmwait.h | 0 .../nsprpub => nspr}/pr/include/private/pprthred.h | 0 .../nsprpub => nspr}/pr/include/private/primpl.h | 19 +- .../nsprpub => nspr}/pr/include/private/prpriv.h | 0 {mozilla/nsprpub => nspr}/pr/include/prlink.h | 0 {mozilla/nsprpub => nspr}/pr/include/prlock.h | 0 {mozilla/nsprpub => nspr}/pr/include/prlog.h | 0 {mozilla/nsprpub => nspr}/pr/include/prlong.h | 2 +- {mozilla/nsprpub => nspr}/pr/include/prmem.h | 0 {mozilla/nsprpub => nspr}/pr/include/prmon.h | 0 {mozilla/nsprpub => nspr}/pr/include/prmwait.h | 0 {mozilla/nsprpub => nspr}/pr/include/prnetdb.h | 0 {mozilla/nsprpub => nspr}/pr/include/prolock.h | 0 {mozilla/nsprpub => nspr}/pr/include/prpdce.h | 0 {mozilla/nsprpub => nspr}/pr/include/prprf.h | 0 {mozilla/nsprpub => nspr}/pr/include/prproces.h | 0 {mozilla/nsprpub => nspr}/pr/include/prrng.h | 0 {mozilla/nsprpub => nspr}/pr/include/prrwlock.h | 0 {mozilla/nsprpub => nspr}/pr/include/prshm.h | 0 {mozilla/nsprpub => nspr}/pr/include/prshma.h | 0 {mozilla/nsprpub => nspr}/pr/include/prsystem.h | 0 {mozilla/nsprpub => nspr}/pr/include/prthread.h | 7 + {mozilla/nsprpub => nspr}/pr/include/prtime.h | 13 - {mozilla/nsprpub => nspr}/pr/include/prtpool.h | 0 {mozilla/nsprpub => nspr}/pr/include/prtrace.h | 0 {mozilla/nsprpub => nspr}/pr/include/prtypes.h | 37 +- {mozilla/nsprpub => nspr}/pr/include/prvrsion.h | 0 {mozilla/nsprpub => nspr}/pr/include/prwin16.h | 0 {mozilla/nsprpub => nspr}/pr/src/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/src/Makefile.in | 15 +- .../md/beos => nspr/pr/src/bthreads}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/bthreads/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/bsrcs.mk | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/btcvar.c | 0 .../nsprpub => nspr}/pr/src/bthreads/btlocks.c | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/btmisc.c | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/btmon.c | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/btsem.c | 0 .../nsprpub => nspr}/pr/src/bthreads/btthread.c | 0 {mozilla/nsprpub => nspr}/pr/src/bthreads/objs.mk | 0 .../pr/src/md => nspr/pr/src/cplus}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcascii.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcbase.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcbase.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rccv.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rccv.h | 0 .../nsprpub => nspr}/pr/src/cplus/rcfileio.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcfileio.h | 0 .../nsprpub => nspr}/pr/src/cplus/rcinrval.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcinrval.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcio.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcio.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rclock.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rclock.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcmon.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetdb.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetdb.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetio.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetio.h | 0 .../nsprpub => nspr}/pr/src/cplus/rcthread.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rcthread.h | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rctime.cpp | 0 {mozilla/nsprpub => nspr}/pr/src/cplus/rctime.h | 0 .../malloc => nspr/pr/src/cplus/tests}/.cvsignore | 0 .../pr/src/cplus/tests/Makefile.in | 28 +- .../nsprpub => nspr}/pr/src/cplus/tests/fileio.cpp | 0 .../pr/src/cplus/tests/interval.cpp | 0 .../pr/src/cplus/tests/ranfile.cpp | 0 .../nsprpub => nspr}/pr/src/cplus/tests/switch.cpp | 0 .../nsprpub => nspr}/pr/src/cplus/tests/thread.cpp | 0 .../nsprpub => nspr}/pr/src/cplus/tests/time.cpp | 0 .../nsprpub => nspr}/pr/src/cplus/tests/tpd.cpp | 0 .../pr/src/linking => nspr/pr/src/io}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/src/io/Makefile.in | 7 - {mozilla/nsprpub => nspr}/pr/src/io/prdir.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prfdcach.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prfile.c | 8 +- {mozilla/nsprpub => nspr}/pr/src/io/prio.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/priometh.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/pripv6.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prlayer.c | 9 + {mozilla/nsprpub => nspr}/pr/src/io/prlog.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prmapopt.c | 11 - {mozilla/nsprpub => nspr}/pr/src/io/prmmap.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prmwait.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prpolevt.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prprf.c | 0 {mozilla/nsprpub => nspr}/pr/src/io/prscanf.c | 3 - {mozilla/nsprpub => nspr}/pr/src/io/prsocket.c | 8 - {mozilla/nsprpub => nspr}/pr/src/io/prstdio.c | 0 .../pr/src/io => nspr/pr/src/linking}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/linking/Makefile.in | 7 - {mozilla/nsprpub => nspr}/pr/src/linking/prlink.c | 13 +- .../cplus/tests => nspr/pr/src/malloc}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/malloc/Makefile.in | 7 - {mozilla/nsprpub => nspr}/pr/src/malloc/prmalloc.c | 0 {mozilla/nsprpub => nspr}/pr/src/malloc/prmem.c | 0 .../pr/src/cplus => nspr/pr/src/md}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/src/md/Makefile.in | 0 .../bthreads => nspr/pr/src/md/beos}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/md/beos/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bcpu.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/beos.c | 0 .../nsprpub => nspr}/pr/src/md/beos/beos_errors.c | 2 +- {mozilla/nsprpub => nspr}/pr/src/md/beos/bfile.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bmemory.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bmisc.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bmmap.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bnet.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bproc.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/brng.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bseg.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/bsrcs.mk | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/btime.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/beos/objs.mk | 0 .../private => nspr/pr/src/md/os2}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/md/os2/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/objs.mk | 0 .../nsprpub => nspr}/pr/src/md/os2/os2_errors.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2cv.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2emx.s | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2gc.c | 0 .../nsprpub => nspr}/pr/src/md/os2/os2inrval.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2io.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2misc.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2poll.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2rng.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2sem.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2sock.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/os2/os2thred.c | 0 .../nsprpub => nspr}/pr/src/md/os2/os2vaclegacy.s | 0 {mozilla/nsprpub => nspr}/pr/src/md/prosdep.c | 7 +- .../obsolete => nspr/pr/src/md/unix}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/md/unix/Makefile.in | 6 +- {mozilla/nsprpub => nspr}/pr/src/md/unix/aix.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/aixwrap.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/bsdi.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/darwin.c | 35 ++ {mozilla/nsprpub => nspr}/pr/src/md/unix/dgux.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/freebsd.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/hpux.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/irix.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/linux.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/netbsd.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/nto.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/objs.mk | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/openbsd.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/os_AIX.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_BSD_386_2.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_Darwin.s | 0 .../pr/src/md/unix/os_Darwin_ppc.s | 0 .../pr/src/md/unix/os_Darwin_x86.s | 0 .../pr/src/md/unix/os_Darwin_x86_64.s | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/os_HPUX.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_HPUX_ia64.s | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Irix.s | 0 .../pr/src/md/unix/os_Linux_ia64.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_Linux_ppc.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_Linux_x86.s | 0 .../pr/src/md/unix/os_Linux_x86_64.s | 0 .../pr/src/md/unix/os_SunOS_sparcv9.s | 0 .../pr/src/md/unix/os_SunOS_ultrasparc.s | 0 .../nsprpub => nspr}/pr/src/md/unix/os_SunOS_x86.s | 0 .../pr/src/md/unix/os_SunOS_x86_64.s | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/osf1.c | 0 .../pr/src/md/unix/pthreads_user.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/qnx.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/riscos.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/scoos.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/solaris.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/symbian.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/unix.c | 51 ++- .../nsprpub => nspr}/pr/src/md/unix/unix_errors.c | 2 +- .../nsprpub => nspr}/pr/src/md/unix/unixware.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/uxpoll.c | 0 .../nsprpub => nspr}/pr/src/md/unix/uxproces.c | 9 +- {mozilla/nsprpub => nspr}/pr/src/md/unix/uxrng.c | 44 -- {mozilla/nsprpub => nspr}/pr/src/md/unix/uxshm.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/unix/uxwrap.c | 5 +- .../md => nspr/pr/src/md/windows}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/md/windows/Makefile.in | 0 .../nsprpub => nspr}/pr/src/md/windows/ntdllmn.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/windows/ntgc.c | 0 .../nsprpub => nspr}/pr/src/md/windows/ntinrval.c | 0 {mozilla/nsprpub => nspr}/pr/src/md/windows/ntio.c | 0 .../nsprpub => nspr}/pr/src/md/windows/ntmisc.c | 0 .../nsprpub => nspr}/pr/src/md/windows/ntsec.c | 0 .../nsprpub => nspr}/pr/src/md/windows/ntsem.c | 4 +- .../nsprpub => nspr}/pr/src/md/windows/ntthread.c | 0 .../nsprpub => nspr}/pr/src/md/windows/objs.mk | 0 .../nsprpub => nspr}/pr/src/md/windows/w32ipcsem.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w32poll.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w32rng.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w32shm.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w95cv.c | 54 ++- .../pr/src/md/windows/w95dllmain.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w95io.c | 380 +--------------- .../nsprpub => nspr}/pr/src/md/windows/w95sock.c | 0 .../nsprpub => nspr}/pr/src/md/windows/w95thred.c | 0 .../pr/src/md/windows/win32_errors.c | 0 .../pr/include => nspr/pr/src/memory}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/memory/Makefile.in | 0 {mozilla/nsprpub => nspr}/pr/src/memory/prseg.c | 0 {mozilla/nsprpub => nspr}/pr/src/memory/prshm.c | 0 {mozilla/nsprpub => nspr}/pr/src/memory/prshma.c | 0 .../nsprpub/pr => nspr/pr/src/misc}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/src/misc/Makefile.in | 0 .../nsprpub => nspr}/pr/src/misc/compile-et.pl | 0 {mozilla/nsprpub => nspr}/pr/src/misc/dtoa.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/pralarm.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/pratom.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/praton.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prcountr.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prdtoa.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prenv.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prerr.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prerr.et | 0 .../nsprpub => nspr}/pr/src/misc/prerr.properties | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prerror.c | 0 .../nsprpub => nspr}/pr/src/misc/prerrortable.c | 3 - {mozilla/nsprpub => nspr}/pr/src/misc/prinit.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prinrval.c | 7 - {mozilla/nsprpub => nspr}/pr/src/misc/pripc.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/pripcsem.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prlog2.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prlong.c | 2 +- {mozilla/nsprpub => nspr}/pr/src/misc/prnetdb.c | 4 +- {mozilla/nsprpub => nspr}/pr/src/misc/prolock.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prrng.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prsystem.c | 45 +- {mozilla/nsprpub => nspr}/pr/src/misc/prthinfo.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prtime.c | 2 +- {mozilla/nsprpub => nspr}/pr/src/misc/prtpool.c | 0 {mozilla/nsprpub => nspr}/pr/src/misc/prtrace.c | 0 {mozilla/nsprpub => nspr}/pr/src/nspr.def | 0 {mozilla/nsprpub => nspr}/pr/src/nspr.rc | 0 {mozilla/nsprpub => nspr}/pr/src/os2extra.def | 0 {mozilla/nsprpub => nspr}/pr/src/prvrsion.c | 0 .../lib/tests => nspr/pr/src/pthreads}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/pthreads/Makefile.in | 7 - {mozilla/nsprpub => nspr}/pr/src/pthreads/ptio.c | 4 +- {mozilla/nsprpub => nspr}/pr/src/pthreads/ptmisc.c | 0 .../nsprpub => nspr}/pr/src/pthreads/ptsynch.c | 0 .../nsprpub => nspr}/pr/src/pthreads/ptthread.c | 85 +++- .../testprstrm => nspr/pr/src/threads}/.cvsignore | 0 .../nsprpub => nspr}/pr/src/threads/Makefile.in | 0 .../pr/src/threads/combined}/.cvsignore | 0 .../pr/src/threads/combined/Makefile.in | 7 - .../pr/src/threads/combined/README | 0 .../pr/src/threads/combined/prucpu.c | 0 .../pr/src/threads/combined/prucv.c | 0 .../pr/src/threads/combined/prulock.c | 0 .../pr/src/threads/combined/prustack.c | 0 .../pr/src/threads/combined/pruthr.c | 2 + {mozilla/nsprpub => nspr}/pr/src/threads/prcmon.c | 0 {mozilla/nsprpub => nspr}/pr/src/threads/prcthr.c | 0 {mozilla/nsprpub => nspr}/pr/src/threads/prdump.c | 0 {mozilla/nsprpub => nspr}/pr/src/threads/prmon.c | 0 .../nsprpub => nspr}/pr/src/threads/prrwlock.c | 0 {mozilla/nsprpub => nspr}/pr/src/threads/prsem.c | 0 {mozilla/nsprpub => nspr}/pr/src/threads/prtpd.c | 0 .../lib/libc/include => nspr/pr/tests}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/tests/Makefile.in | 60 +-- {mozilla/nsprpub => nspr}/pr/tests/README.TXT | 0 {mozilla/nsprpub => nspr}/pr/tests/accept.c | 0 {mozilla/nsprpub => nspr}/pr/tests/acceptread.c | 0 {mozilla/nsprpub => nspr}/pr/tests/acceptreademu.c | 0 {mozilla/nsprpub => nspr}/pr/tests/addrstr.c | 0 {mozilla/nsprpub => nspr}/pr/tests/affinity.c | 0 {mozilla/nsprpub => nspr}/pr/tests/alarm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/anonfm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/append.c | 0 {mozilla/nsprpub => nspr}/pr/tests/atomic.c | 0 {mozilla/nsprpub => nspr}/pr/tests/attach.c | 0 {mozilla/nsprpub => nspr}/pr/tests/bigfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/bigfile2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/bigfile3.c | 0 {mozilla/nsprpub => nspr}/pr/tests/bug1test.c | 0 {mozilla/nsprpub => nspr}/pr/tests/cleanup.c | 0 {mozilla/nsprpub => nspr}/pr/tests/cltsrv.c | 0 {mozilla/nsprpub => nspr}/pr/tests/concur.c | 0 {mozilla/nsprpub => nspr}/pr/tests/cvar.c | 0 {mozilla/nsprpub => nspr}/pr/tests/cvar2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dbmalloc.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dbmalloc1.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dceemu.c | 0 {mozilla/nsprpub => nspr}/pr/tests/depend.c | 0 .../lib/libc => nspr/pr/tests/dll}/.cvsignore | 0 {mozilla/nsprpub => nspr}/pr/tests/dll/Makefile.in | 7 - {mozilla/nsprpub => nspr}/pr/tests/dll/my.def | 0 {mozilla/nsprpub => nspr}/pr/tests/dll/mygetval.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dll/mysetval.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dlltest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/dtoa.c | 0 {mozilla/nsprpub => nspr}/pr/tests/env.c | 0 {mozilla/nsprpub => nspr}/pr/tests/errcodes.c | 0 {mozilla/nsprpub => nspr}/pr/tests/errset.c | 0 {mozilla/nsprpub => nspr}/pr/tests/exit.c | 0 {mozilla/nsprpub => nspr}/pr/tests/fdcach.c | 0 {mozilla/nsprpub => nspr}/pr/tests/fileio.c | 0 {mozilla/nsprpub => nspr}/pr/tests/foreign.c | 0 {mozilla/nsprpub => nspr}/pr/tests/forktest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/formattm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/freeif.c | 0 {mozilla/nsprpub => nspr}/pr/tests/fsync.c | 0 {mozilla/nsprpub => nspr}/pr/tests/getai.c | 0 {mozilla/nsprpub => nspr}/pr/tests/gethost.c | 0 {mozilla/nsprpub => nspr}/pr/tests/getproto.c | 0 {mozilla/nsprpub => nspr}/pr/tests/i2l.c | 0 {mozilla/nsprpub => nspr}/pr/tests/initclk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/inrval.c | 0 {mozilla/nsprpub => nspr}/pr/tests/instrumt.c | 0 {mozilla/nsprpub => nspr}/pr/tests/intrio.c | 0 {mozilla/nsprpub => nspr}/pr/tests/intrupt.c | 0 {mozilla/nsprpub => nspr}/pr/tests/io_timeout.c | 0 {mozilla/nsprpub => nspr}/pr/tests/io_timeoutk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/io_timeoutu.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ioconthr.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ipv6.c | 0 {mozilla/nsprpub => nspr}/pr/tests/join.c | 0 {mozilla/nsprpub => nspr}/pr/tests/joinkk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/joinku.c | 0 {mozilla/nsprpub => nspr}/pr/tests/joinuk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/joinuu.c | 0 {mozilla/nsprpub => nspr}/pr/tests/layer.c | 0 {mozilla/nsprpub => nspr}/pr/tests/lazyinit.c | 0 {mozilla/nsprpub => nspr}/pr/tests/libfilename.c | 0 {mozilla/nsprpub => nspr}/pr/tests/lltest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/lock.c | 0 {mozilla/nsprpub => nspr}/pr/tests/lockfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/logfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/logger.c | 0 {mozilla/nsprpub => nspr}/pr/tests/makedir.c | 0 {mozilla/nsprpub => nspr}/pr/tests/many_cv.c | 0 {mozilla/nsprpub => nspr}/pr/tests/mbcs.c | 0 {mozilla/nsprpub => nspr}/pr/tests/multiacc.c | 0 {mozilla/nsprpub => nspr}/pr/tests/multiwait.c | 0 {mozilla/nsprpub => nspr}/pr/tests/nameshm1.c | 0 {mozilla/nsprpub => nspr}/pr/tests/nbconn.c | 0 {mozilla/nsprpub => nspr}/pr/tests/nblayer.c | 0 {mozilla/nsprpub => nspr}/pr/tests/nonblock.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ntioto.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ntoh.c | 0 {mozilla/nsprpub => nspr}/pr/tests/obsints.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_2long.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_excl.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_filnf.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_filok.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_noacc.c | 0 {mozilla/nsprpub => nspr}/pr/tests/op_nofil.c | 0 {mozilla/nsprpub => nspr}/pr/tests/openfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/parent.c | 0 {mozilla/nsprpub => nspr}/pr/tests/parsetm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/peek.c | 0 {mozilla/nsprpub => nspr}/pr/tests/perf.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pipeping.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pipeping2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pipepong.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pipepong2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pipeself.c | 0 {mozilla/nsprpub => nspr}/pr/tests/poll_er.c | 0 {mozilla/nsprpub => nspr}/pr/tests/poll_nm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/poll_to.c | 0 {mozilla/nsprpub => nspr}/pr/tests/pollable.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prftest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prftest1.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prftest2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/primblok.c | 0 {mozilla/nsprpub => nspr}/pr/tests/priotest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/provider.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prpoll.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prpollml.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prselect.c | 0 {mozilla/nsprpub => nspr}/pr/tests/prttools.h | 0 nspr/pr/tests/pushtop.c | 73 +++ {mozilla/nsprpub => nspr}/pr/tests/randseed.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ranfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/reinit.c | 0 {mozilla/nsprpub => nspr}/pr/tests/rmdir.c | 0 {mozilla/nsprpub => nspr}/pr/tests/runtests.pl | 1 + {mozilla/nsprpub => nspr}/pr/tests/runtests.sh | 1 + {mozilla/nsprpub => nspr}/pr/tests/runy2ktests.ksh | 0 {mozilla/nsprpub => nspr}/pr/tests/rwlocktest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sel_spd.c | 0 {mozilla/nsprpub => nspr}/pr/tests/selct_er.c | 0 {mozilla/nsprpub => nspr}/pr/tests/selct_nm.c | 0 {mozilla/nsprpub => nspr}/pr/tests/selct_to.c | 0 {mozilla/nsprpub => nspr}/pr/tests/select2.c | 0 {mozilla/nsprpub => nspr}/pr/tests/selintr.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sem.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sema.c | 0 {mozilla/nsprpub => nspr}/pr/tests/semaerr.c | 0 {mozilla/nsprpub => nspr}/pr/tests/semaerr1.c | 0 {mozilla/nsprpub => nspr}/pr/tests/semaping.c | 0 {mozilla/nsprpub => nspr}/pr/tests/semapong.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sendzlf.c | 0 {mozilla/nsprpub => nspr}/pr/tests/server_test.c | 0 {mozilla/nsprpub => nspr}/pr/tests/servr_kk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/servr_ku.c | 0 {mozilla/nsprpub => nspr}/pr/tests/servr_uk.c | 0 {mozilla/nsprpub => nspr}/pr/tests/servr_uu.c | 0 {mozilla/nsprpub => nspr}/pr/tests/short_thread.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sigpipe.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sleep.c | 0 {mozilla/nsprpub => nspr}/pr/tests/socket.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sockopt.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sockping.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sockpong.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sprintf.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sproc_ch.c | 0 {mozilla/nsprpub => nspr}/pr/tests/sproc_p.c | 0 {mozilla/nsprpub => nspr}/pr/tests/stack.c | 0 {mozilla/nsprpub => nspr}/pr/tests/stat.c | 0 {mozilla/nsprpub => nspr}/pr/tests/stdio.c | 0 {mozilla/nsprpub => nspr}/pr/tests/str2addr.c | 0 {mozilla/nsprpub => nspr}/pr/tests/strod.c | 0 {mozilla/nsprpub => nspr}/pr/tests/suspend.c | 0 {mozilla/nsprpub => nspr}/pr/tests/switch.c | 0 {mozilla/nsprpub => nspr}/pr/tests/system.c | 0 {mozilla/nsprpub => nspr}/pr/tests/testbit.c | 0 {mozilla/nsprpub => nspr}/pr/tests/testfile.c | 0 {mozilla/nsprpub => nspr}/pr/tests/threads.c | 0 .../nsprpub => nspr}/pr/tests/thrpool_client.c | 0 .../nsprpub => nspr}/pr/tests/thrpool_server.c | 0 {mozilla/nsprpub => nspr}/pr/tests/thruput.c | 0 {mozilla/nsprpub => nspr}/pr/tests/time.c | 0 {mozilla/nsprpub => nspr}/pr/tests/timemac.c | 0 {mozilla/nsprpub => nspr}/pr/tests/timetest.c | 0 {mozilla/nsprpub => nspr}/pr/tests/tmoacc.c | 0 {mozilla/nsprpub => nspr}/pr/tests/tmocon.c | 0 {mozilla/nsprpub => nspr}/pr/tests/tpd.c | 0 {mozilla/nsprpub => nspr}/pr/tests/udpsrv.c | 0 {mozilla/nsprpub => nspr}/pr/tests/ut_ttools.h | 0 {mozilla/nsprpub => nspr}/pr/tests/vercheck.c | 14 +- {mozilla/nsprpub => nspr}/pr/tests/version.c | 0 {mozilla/nsprpub => nspr}/pr/tests/writev.c | 0 {mozilla/nsprpub => nspr}/pr/tests/xnotify.c | 0 {mozilla/nsprpub => nspr}/pr/tests/y2k.c | 0 {mozilla/nsprpub => nspr}/pr/tests/y2ktmo.c | 0 {mozilla/nsprpub => nspr}/pr/tests/yield.c | 0 {mozilla/nsprpub => nspr}/pr/tests/zerolen.c | 0 {mozilla/nsprpub/lib => nspr/tools}/.cvsignore | 0 {mozilla/nsprpub => nspr}/tools/Makefile.in | 20 - {mozilla/nsprpub => nspr}/tools/httpget.c | 0 {mozilla/nsprpub => nspr}/tools/tail.c | 0 925 files changed, 897 insertions(+), 5735 deletions(-) delete mode 100644 mozilla/CVS/Entries delete mode 100644 mozilla/CVS/Entries.Static delete mode 100644 mozilla/CVS/Repository delete mode 100644 mozilla/CVS/Root delete mode 100644 mozilla/CVS/Tag delete mode 100644 mozilla/nsprpub/CVS/Entries delete mode 100644 mozilla/nsprpub/CVS/Repository delete mode 100644 mozilla/nsprpub/CVS/Root delete mode 100644 mozilla/nsprpub/CVS/Tag delete mode 100644 mozilla/nsprpub/admin/CVS/Entries delete mode 100644 mozilla/nsprpub/admin/CVS/Repository delete mode 100644 mozilla/nsprpub/admin/CVS/Root delete mode 100644 mozilla/nsprpub/admin/CVS/Tag delete mode 100755 mozilla/nsprpub/admin/repackage.sh delete mode 100644 mozilla/nsprpub/build/CVS/Entries delete mode 100644 mozilla/nsprpub/build/CVS/Repository delete mode 100644 mozilla/nsprpub/build/CVS/Root delete mode 100644 mozilla/nsprpub/build/CVS/Tag delete mode 100644 mozilla/nsprpub/build/autoconf/CVS/Entries delete mode 100644 mozilla/nsprpub/build/autoconf/CVS/Repository delete mode 100644 mozilla/nsprpub/build/autoconf/CVS/Root delete mode 100644 mozilla/nsprpub/build/autoconf/CVS/Tag delete mode 100644 mozilla/nsprpub/build/win32/CVS/Entries delete mode 100644 mozilla/nsprpub/build/win32/CVS/Repository delete mode 100644 mozilla/nsprpub/build/win32/CVS/Root delete mode 100644 mozilla/nsprpub/build/win32/CVS/Tag delete mode 100644 mozilla/nsprpub/config/CVS/Entries delete mode 100644 mozilla/nsprpub/config/CVS/Repository delete mode 100644 mozilla/nsprpub/config/CVS/Root delete mode 100644 mozilla/nsprpub/config/CVS/Tag delete mode 100644 mozilla/nsprpub/include/CVS/Entries delete mode 100644 mozilla/nsprpub/include/CVS/Repository delete mode 100644 mozilla/nsprpub/include/CVS/Root delete mode 100644 mozilla/nsprpub/include/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/CVS/Root delete mode 100644 mozilla/nsprpub/lib/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/ds/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/ds/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/ds/CVS/Root delete mode 100644 mozilla/nsprpub/lib/ds/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/libc/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/libc/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/libc/CVS/Root delete mode 100644 mozilla/nsprpub/lib/libc/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/libc/include/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/libc/include/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/libc/include/CVS/Root delete mode 100644 mozilla/nsprpub/lib/libc/include/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/libc/src/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/libc/src/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/libc/src/CVS/Root delete mode 100644 mozilla/nsprpub/lib/libc/src/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/msgc/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/msgc/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/msgc/CVS/Root delete mode 100644 mozilla/nsprpub/lib/msgc/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/msgc/include/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/msgc/include/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/msgc/include/CVS/Root delete mode 100644 mozilla/nsprpub/lib/msgc/include/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/msgc/src/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/msgc/src/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/msgc/src/CVS/Root delete mode 100644 mozilla/nsprpub/lib/msgc/src/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/msgc/tests/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/msgc/tests/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/msgc/tests/CVS/Root delete mode 100644 mozilla/nsprpub/lib/msgc/tests/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/prstreams/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/prstreams/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/prstreams/CVS/Root delete mode 100644 mozilla/nsprpub/lib/prstreams/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/CVS/Root delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root delete mode 100644 mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/tests/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/tests/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/tests/CVS/Root delete mode 100644 mozilla/nsprpub/lib/tests/CVS/Tag delete mode 100644 mozilla/nsprpub/lib/tests/windows/CVS/Entries delete mode 100644 mozilla/nsprpub/lib/tests/windows/CVS/Repository delete mode 100644 mozilla/nsprpub/lib/tests/windows/CVS/Root delete mode 100644 mozilla/nsprpub/lib/tests/windows/CVS/Tag delete mode 100644 mozilla/nsprpub/macbuild/CVS/Entries delete mode 100644 mozilla/nsprpub/macbuild/CVS/Repository delete mode 100644 mozilla/nsprpub/macbuild/CVS/Root delete mode 100644 mozilla/nsprpub/macbuild/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/linux/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/linux/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/linux/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/linux/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Tag delete mode 100644 mozilla/nsprpub/pkg/solaris/common_files/CVS/Entries delete mode 100644 mozilla/nsprpub/pkg/solaris/common_files/CVS/Repository delete mode 100644 mozilla/nsprpub/pkg/solaris/common_files/CVS/Root delete mode 100644 mozilla/nsprpub/pkg/solaris/common_files/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/CVS/Root delete mode 100644 mozilla/nsprpub/pr/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/include/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/include/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/include/CVS/Root delete mode 100644 mozilla/nsprpub/pr/include/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/include/md/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/include/md/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/include/md/CVS/Root delete mode 100644 mozilla/nsprpub/pr/include/md/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/include/md/_ncr.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_ncr.h delete mode 100644 mozilla/nsprpub/pr/include/md/_nec.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_nec.h delete mode 100644 mozilla/nsprpub/pr/include/md/_nextstep.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_nextstep.h delete mode 100644 mozilla/nsprpub/pr/include/md/_reliantunix.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_reliantunix.h delete mode 100644 mozilla/nsprpub/pr/include/md/_sony.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_sony.h delete mode 100644 mozilla/nsprpub/pr/include/md/_sunos4.cfg delete mode 100644 mozilla/nsprpub/pr/include/md/_sunos4.h delete mode 100644 mozilla/nsprpub/pr/include/md/sunos4.h delete mode 100644 mozilla/nsprpub/pr/include/obsolete/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/include/obsolete/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/include/obsolete/CVS/Root delete mode 100644 mozilla/nsprpub/pr/include/obsolete/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/include/private/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/include/private/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/include/private/CVS/Root delete mode 100644 mozilla/nsprpub/pr/include/private/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/bthreads/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/bthreads/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/bthreads/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/bthreads/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/cplus/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/cplus/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/cplus/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/cplus/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/cplus/tests/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/cplus/tests/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/cplus/tests/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/cplus/tests/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/cthreads/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/cthreads/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/cthreads/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/cthreads/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/io/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/io/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/io/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/io/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/linking/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/linking/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/linking/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/linking/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/malloc/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/malloc/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/malloc/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/malloc/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/beos/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/beos/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/beos/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/beos/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/mac/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/mac/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/mac/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/mac/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/os2/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/os2/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/os2/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/os2/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/unix/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/unix/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/unix/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/unix/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/md/unix/ncr.c delete mode 100644 mozilla/nsprpub/pr/src/md/unix/nec.c delete mode 100644 mozilla/nsprpub/pr/src/md/unix/nextstep.c delete mode 100644 mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s delete mode 100644 mozilla/nsprpub/pr/src/md/unix/reliantunix.c delete mode 100644 mozilla/nsprpub/pr/src/md/unix/sony.c delete mode 100644 mozilla/nsprpub/pr/src/md/unix/sunos4.c delete mode 100644 mozilla/nsprpub/pr/src/md/windows/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/md/windows/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/md/windows/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/md/windows/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/memory/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/memory/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/memory/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/memory/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/misc/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/misc/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/misc/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/misc/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/pthreads/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/pthreads/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/pthreads/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/pthreads/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/threads/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/threads/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/threads/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/threads/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/src/threads/combined/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/src/threads/combined/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/src/threads/combined/CVS/Root delete mode 100644 mozilla/nsprpub/pr/src/threads/combined/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/tests/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/tests/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/tests/CVS/Root delete mode 100644 mozilla/nsprpub/pr/tests/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/tests/dll/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/tests/dll/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/tests/dll/CVS/Root delete mode 100644 mozilla/nsprpub/pr/tests/dll/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/tests/macbuild/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/tests/macbuild/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/tests/macbuild/CVS/Root delete mode 100644 mozilla/nsprpub/pr/tests/macbuild/CVS/Tag delete mode 100644 mozilla/nsprpub/pr/tests/w16gui/CVS/Entries delete mode 100644 mozilla/nsprpub/pr/tests/w16gui/CVS/Repository delete mode 100644 mozilla/nsprpub/pr/tests/w16gui/CVS/Root delete mode 100644 mozilla/nsprpub/pr/tests/w16gui/CVS/Tag delete mode 100644 mozilla/nsprpub/tools/CVS/Entries delete mode 100644 mozilla/nsprpub/tools/CVS/Repository delete mode 100644 mozilla/nsprpub/tools/CVS/Root delete mode 100644 mozilla/nsprpub/tools/CVS/Tag rename {mozilla/nsprpub => nspr}/.cvsignore (100%) create mode 100644 nspr/.hg_archival.txt create mode 100644 nspr/.hgignore rename {mozilla/nsprpub => nspr}/LICENSE (100%) rename {mozilla/nsprpub => nspr}/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/aclocal.m4 (100%) rename {mozilla/nsprpub => nspr}/admin/explode.pl (100%) rename {mozilla/nsprpub => nspr}/admin/makeTargetDirs.sh (100%) rename {mozilla/nsprpub => nspr}/admin/symlinks.sh (100%) rename {mozilla/nsprpub => nspr}/build/autoconf/acwinpaths.m4 (100%) rename {mozilla/nsprpub => nspr}/build/autoconf/config.guess (100%) rename {mozilla/nsprpub => nspr}/build/autoconf/config.sub (100%) rename {mozilla/nsprpub => nspr}/build/autoconf/install-sh (100%) rename {mozilla/nsprpub => nspr}/build/cygwin-wrapper (100%) rename {mozilla/nsprpub => nspr}/build/win32/pgomerge.py (100%) rename {mozilla/nsprpub => nspr}/config/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/config/Makefile.in (97%) rename {mozilla/nsprpub => nspr}/config/autoconf.mk.in (100%) rename {mozilla/nsprpub => nspr}/config/config.mk (100%) rename {mozilla/nsprpub => nspr}/config/gcc_hidden.h (100%) rename {mozilla/nsprpub => nspr}/config/libc_r.h (100%) rename {mozilla/nsprpub => nspr}/config/make-system-wrappers.pl (100%) rename {mozilla/nsprpub => nspr}/config/nfspwd.pl (100%) rename {mozilla/nsprpub => nspr}/config/now.c (100%) rename {mozilla/nsprpub => nspr}/config/nsinstall.c (94%) rename {mozilla/nsprpub => nspr}/config/nspr-config.in (100%) rename {mozilla/nsprpub => nspr}/config/nspr.m4 (100%) rename {mozilla/nsprpub => nspr}/config/nspr.pc.in (100%) rename {mozilla/nsprpub => nspr}/config/nsprincl.mk.in (100%) rename {mozilla/nsprpub => nspr}/config/nsprincl.sh.in (100%) rename {mozilla/nsprpub => nspr}/config/pathsub.h (95%) rename {mozilla/nsprpub => nspr}/config/prdepend.h (99%) rename {mozilla/nsprpub => nspr}/config/rules.mk (100%) rename {mozilla/nsprpub => nspr}/config/system-headers (100%) rename {mozilla/nsprpub => nspr}/configure (94%) rename {mozilla/nsprpub => nspr}/configure.in (96%) rename {mozilla/nsprpub/tools => nspr/lib}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/Makefile.in (100%) rename {mozilla/nsprpub/lib/libc/src => nspr/lib/ds}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/ds/Makefile.in (96%) rename {mozilla/nsprpub => nspr}/lib/ds/plarena.c (94%) rename {mozilla/nsprpub => nspr}/lib/ds/plarena.h (68%) rename {mozilla/nsprpub => nspr}/lib/ds/plarenas.h (81%) rename {mozilla/nsprpub => nspr}/lib/ds/plds.def (95%) rename {mozilla/nsprpub => nspr}/lib/ds/plds.rc (100%) rename {mozilla/nsprpub => nspr}/lib/ds/plhash.c (100%) rename {mozilla/nsprpub => nspr}/lib/ds/plhash.h (100%) rename {mozilla/nsprpub => nspr}/lib/ds/plvrsion.c (100%) rename {mozilla/nsprpub/pr/tests/dll => nspr/lib/libc}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/libc/Makefile.in (100%) rename {mozilla/nsprpub/lib/libc/src => nspr/lib/libc}/README (100%) rename {mozilla/nsprpub/pr/tests => nspr/lib/libc/include}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/README (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/plbase64.h (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/plerror.h (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/plgetopt.h (100%) rename {mozilla/nsprpub => nspr}/lib/libc/include/plstr.h (100%) rename {mozilla/nsprpub/lib/ds => nspr/lib/libc/src}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/Makefile.in (96%) rename {mozilla/nsprpub/lib/libc => nspr/lib/libc/src}/README (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/base64.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/plc.def (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/plc.rc (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/plerror.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/plgetopt.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/plvrsion.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strcase.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strcat.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strchr.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strcmp.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strcpy.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strdup.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strlen.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strpbrk.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strstr.c (100%) rename {mozilla/nsprpub => nspr}/lib/libc/src/strtok.c (100%) rename {mozilla/nsprpub/pr/src/threads/combined => nspr/lib/prstreams}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/prstreams/Makefile.in (96%) rename {mozilla/nsprpub => nspr}/lib/prstreams/plvrsion.c (100%) rename {mozilla/nsprpub => nspr}/lib/prstreams/prstrms.cpp (100%) rename {mozilla/nsprpub => nspr}/lib/prstreams/prstrms.h (100%) rename {mozilla/nsprpub => nspr}/lib/prstreams/prstrms.rc (100%) rename {mozilla/nsprpub/pr/src/threads => nspr/lib/prstreams/tests/testprstrm}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/prstreams/tests/testprstrm/Makefile.in (83%) rename {mozilla/nsprpub => nspr}/lib/prstreams/tests/testprstrm/testprstrm.cpp (100%) rename {mozilla/nsprpub/pr/src/pthreads => nspr/lib/tests}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/lib/tests/Makefile.in (89%) rename {mozilla/nsprpub => nspr}/lib/tests/arena.c (100%) rename {mozilla/nsprpub => nspr}/lib/tests/base64t.c (100%) rename {mozilla/nsprpub => nspr}/lib/tests/getopt.c (100%) rename {mozilla/nsprpub => nspr}/lib/tests/string.c (100%) rename {mozilla/nsprpub => nspr}/pkg/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pkg/linux/Makefile.in (97%) rename {mozilla/nsprpub => nspr}/pkg/linux/sun-nspr.spec (100%) rename {mozilla/nsprpub => nspr}/pkg/solaris/Makefile-devl.com (90%) rename {mozilla/nsprpub => nspr}/pkg/solaris/Makefile-devl.targ (92%) rename {mozilla/nsprpub => nspr}/pkg/solaris/Makefile.com (91%) rename {mozilla/nsprpub => nspr}/pkg/solaris/Makefile.in (96%) rename {mozilla/nsprpub => nspr}/pkg/solaris/Makefile.targ (92%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/Makefile.in (88%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/depend (94%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/pkginfo.tmpl (93%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/prototype_com (94%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/prototype_i386 (95%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWpr/prototype_sparc (96%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWprd/Makefile.in (88%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWprd/depend (93%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWprd/pkginfo.tmpl (94%) rename {mozilla/nsprpub => nspr}/pkg/solaris/SUNWprd/prototype (98%) rename {mozilla/nsprpub => nspr}/pkg/solaris/bld_awk_pkginfo.ksh (95%) rename {mozilla/nsprpub => nspr}/pkg/solaris/common_files/copyright (100%) rename {mozilla/nsprpub => nspr}/pkg/solaris/proto64.mk (85%) rename {mozilla/nsprpub/pr/src/misc => nspr/pr}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/Makefile.in (100%) rename {mozilla/nsprpub/pr/src/memory => nspr/pr/include}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/include/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/include/gencfg.c (95%) rename {mozilla/nsprpub/pr/src/md/windows => nspr/pr/include/md}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_aix.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_aix32.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_aix64.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_beos.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_beos.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_bsdi.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_bsdi.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_darwin.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_darwin.h (96%) rename {mozilla/nsprpub => nspr}/pr/include/md/_dgux.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_dgux.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_freebsd.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_freebsd.h (96%) rename {mozilla/nsprpub => nspr}/pr/include/md/_hpux.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_hpux32.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_hpux64.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_irix.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_irix32.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_irix64.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_linux.cfg (90%) rename {mozilla/nsprpub => nspr}/pr/include/md/_linux.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_netbsd.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_netbsd.h (96%) rename {mozilla/nsprpub => nspr}/pr/include/md/_nspr_pthread.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_nto.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_nto.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_openbsd.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_openbsd.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_os2.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_os2.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_os2_errors.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_osf1.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_osf1.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_pcos.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_pth.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_qnx.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_qnx.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_riscos.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_riscos.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_scoos.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_scoos.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_solaris.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_solaris.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_symbian.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_symbian.h (83%) rename {mozilla/nsprpub => nspr}/pr/include/md/_unix_errors.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_unixos.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_unixware.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_unixware.h (97%) rename {mozilla/nsprpub => nspr}/pr/include/md/_unixware7.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_win32_errors.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_win95.cfg (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_win95.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/md/_winnt.cfg (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/_winnt.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/md/prosdep.h (87%) rename {mozilla/nsprpub => nspr}/pr/include/nspr.h (100%) rename {mozilla/nsprpub/pr/src/md/unix => nspr/pr/include/obsolete}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/include/obsolete/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/include/obsolete/pralarm.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/obsolete/probslet.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/obsolete/protypes.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/obsolete/prsem.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/pratom.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prbit.h (95%) rename {mozilla/nsprpub => nspr}/pr/include/prclist.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prcmon.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prcountr.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prcvar.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prdtoa.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prenv.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prerr.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prerror.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prinet.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prinit.h (98%) rename {mozilla/nsprpub => nspr}/pr/include/prinrval.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prio.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/pripcsem.h (100%) rename {mozilla/nsprpub/pr/src/md/os2 => nspr/pr/include/private}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/include/private/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/include/private/pprio.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/private/pprmwait.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/private/pprthred.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/private/primpl.h (99%) rename {mozilla/nsprpub => nspr}/pr/include/private/prpriv.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prlink.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prlock.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prlog.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prlong.h (99%) rename {mozilla/nsprpub => nspr}/pr/include/prmem.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prmon.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prmwait.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prnetdb.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prolock.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prpdce.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prprf.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prproces.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prrng.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prrwlock.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prshm.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prshma.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prsystem.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prthread.h (96%) rename {mozilla/nsprpub => nspr}/pr/include/prtime.h (95%) rename {mozilla/nsprpub => nspr}/pr/include/prtpool.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prtrace.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prtypes.h (92%) rename {mozilla/nsprpub => nspr}/pr/include/prvrsion.h (100%) rename {mozilla/nsprpub => nspr}/pr/include/prwin16.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/Makefile.in (97%) rename {mozilla/nsprpub/pr/src/md/beos => nspr/pr/src/bthreads}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/bsrcs.mk (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btcvar.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btlocks.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btmisc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btmon.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btsem.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/btthread.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/bthreads/objs.mk (100%) rename {mozilla/nsprpub/pr/src/md => nspr/pr/src/cplus}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcascii.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcbase.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcbase.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rccv.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rccv.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcfileio.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcfileio.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcinrval.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcinrval.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcio.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcio.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rclock.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rclock.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcmon.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetdb.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetdb.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetio.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcnetio.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcthread.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rcthread.h (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rctime.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/rctime.h (100%) rename {mozilla/nsprpub/pr/src/malloc => nspr/pr/src/cplus/tests}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/Makefile.in (84%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/fileio.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/interval.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/ranfile.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/switch.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/thread.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/time.cpp (100%) rename {mozilla/nsprpub => nspr}/pr/src/cplus/tests/tpd.cpp (100%) rename {mozilla/nsprpub/pr/src/linking => nspr/pr/src/io}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/Makefile.in (87%) rename {mozilla/nsprpub => nspr}/pr/src/io/prdir.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prfdcach.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prfile.c (98%) rename {mozilla/nsprpub => nspr}/pr/src/io/prio.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/priometh.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/pripv6.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prlayer.c (98%) rename {mozilla/nsprpub => nspr}/pr/src/io/prlog.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prmapopt.c (98%) rename {mozilla/nsprpub => nspr}/pr/src/io/prmmap.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prmwait.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prpolevt.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prprf.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/io/prscanf.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/io/prsocket.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/io/prstdio.c (100%) rename {mozilla/nsprpub/pr/src/io => nspr/pr/src/linking}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/linking/Makefile.in (82%) rename {mozilla/nsprpub => nspr}/pr/src/linking/prlink.c (99%) rename {mozilla/nsprpub/pr/src/cplus/tests => nspr/pr/src/malloc}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/malloc/Makefile.in (82%) rename {mozilla/nsprpub => nspr}/pr/src/malloc/prmalloc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/malloc/prmem.c (100%) rename {mozilla/nsprpub/pr/src/cplus => nspr/pr/src/md}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/Makefile.in (100%) rename {mozilla/nsprpub/pr/src/bthreads => nspr/pr/src/md/beos}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bcpu.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/beos.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/beos_errors.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bmemory.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bmisc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bmmap.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bnet.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bproc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/brng.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bseg.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/bsrcs.mk (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/btime.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/beos/objs.mk (100%) rename {mozilla/nsprpub/pr/include/private => nspr/pr/src/md/os2}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/objs.mk (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2_errors.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2cv.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2emx.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2gc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2inrval.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2io.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2misc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2poll.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2rng.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2sem.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2sock.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2thred.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/os2/os2vaclegacy.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/prosdep.c (90%) rename {mozilla/nsprpub/pr/include/obsolete => nspr/pr/src/md/unix}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/Makefile.in (96%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/aix.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/aixwrap.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/bsdi.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/darwin.c (66%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/dgux.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/freebsd.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/hpux.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/irix.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/linux.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/netbsd.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/nto.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/objs.mk (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/openbsd.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_AIX.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_BSD_386_2.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Darwin.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Darwin_ppc.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Darwin_x86.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Darwin_x86_64.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_HPUX.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_HPUX_ia64.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Irix.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Linux_ia64.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Linux_ppc.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Linux_x86.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_Linux_x86_64.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_SunOS_sparcv9.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_SunOS_ultrasparc.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_SunOS_x86.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/os_SunOS_x86_64.s (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/osf1.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/pthreads_user.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/qnx.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/riscos.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/scoos.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/solaris.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/symbian.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/unix.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/unix_errors.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/unixware.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/uxpoll.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/uxproces.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/uxrng.c (90%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/uxshm.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/unix/uxwrap.c (98%) rename {mozilla/nsprpub/pr/include/md => nspr/pr/src/md/windows}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntdllmn.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntgc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntinrval.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntio.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntmisc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntsec.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntsem.c (93%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/ntthread.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/objs.mk (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w32ipcsem.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w32poll.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w32rng.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w32shm.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w95cv.c (84%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w95dllmain.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w95io.c (75%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w95sock.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/w95thred.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/md/windows/win32_errors.c (100%) rename {mozilla/nsprpub/pr/include => nspr/pr/src/memory}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/memory/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/memory/prseg.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/memory/prshm.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/memory/prshma.c (100%) rename {mozilla/nsprpub/pr => nspr/pr/src/misc}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/Makefile.in (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/compile-et.pl (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/dtoa.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/pralarm.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/pratom.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/praton.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prcountr.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prdtoa.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prenv.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prerr.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prerr.et (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prerr.properties (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prerror.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prerrortable.c (98%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prinit.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prinrval.c (92%) rename {mozilla/nsprpub => nspr}/pr/src/misc/pripc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/pripcsem.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prlog2.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prlong.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prnetdb.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prolock.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prrng.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prsystem.c (87%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prthinfo.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prtime.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prtpool.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/misc/prtrace.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/nspr.def (100%) rename {mozilla/nsprpub => nspr}/pr/src/nspr.rc (100%) rename {mozilla/nsprpub => nspr}/pr/src/os2extra.def (100%) rename {mozilla/nsprpub => nspr}/pr/src/prvrsion.c (100%) rename {mozilla/nsprpub/lib/tests => nspr/pr/src/pthreads}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/pthreads/Makefile.in (83%) rename {mozilla/nsprpub => nspr}/pr/src/pthreads/ptio.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/pthreads/ptmisc.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/pthreads/ptsynch.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/pthreads/ptthread.c (95%) rename {mozilla/nsprpub/lib/prstreams/tests/testprstrm => nspr/pr/src/threads}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/Makefile.in (100%) rename {mozilla/nsprpub/lib/prstreams => nspr/pr/src/threads/combined}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/Makefile.in (85%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/README (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/prucpu.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/prucv.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/prulock.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/prustack.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/combined/pruthr.c (99%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prcmon.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prcthr.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prdump.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prmon.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prrwlock.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prsem.c (100%) rename {mozilla/nsprpub => nspr}/pr/src/threads/prtpd.c (100%) rename {mozilla/nsprpub/lib/libc/include => nspr/pr/tests}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/tests/Makefile.in (84%) rename {mozilla/nsprpub => nspr}/pr/tests/README.TXT (100%) rename {mozilla/nsprpub => nspr}/pr/tests/accept.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/acceptread.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/acceptreademu.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/addrstr.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/affinity.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/alarm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/anonfm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/append.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/atomic.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/attach.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/bigfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/bigfile2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/bigfile3.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/bug1test.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/cleanup.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/cltsrv.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/concur.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/cvar.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/cvar2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dbmalloc.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dbmalloc1.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dceemu.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/depend.c (100%) rename {mozilla/nsprpub/lib/libc => nspr/pr/tests/dll}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dll/Makefile.in (92%) rename {mozilla/nsprpub => nspr}/pr/tests/dll/my.def (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dll/mygetval.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dll/mysetval.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dlltest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/dtoa.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/env.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/errcodes.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/errset.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/exit.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/fdcach.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/fileio.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/foreign.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/forktest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/formattm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/freeif.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/fsync.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/getai.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/gethost.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/getproto.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/i2l.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/initclk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/inrval.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/instrumt.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/intrio.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/intrupt.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/io_timeout.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/io_timeoutk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/io_timeoutu.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ioconthr.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ipv6.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/join.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/joinkk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/joinku.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/joinuk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/joinuu.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/layer.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/lazyinit.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/libfilename.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/lltest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/lock.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/lockfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/logfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/logger.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/makedir.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/many_cv.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/mbcs.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/multiacc.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/multiwait.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/nameshm1.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/nbconn.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/nblayer.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/nonblock.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ntioto.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ntoh.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/obsints.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_2long.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_excl.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_filnf.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_filok.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_noacc.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/op_nofil.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/openfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/parent.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/parsetm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/peek.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/perf.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pipeping.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pipeping2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pipepong.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pipepong2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pipeself.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/poll_er.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/poll_nm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/poll_to.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/pollable.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prftest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prftest1.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prftest2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/primblok.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/priotest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/provider.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prpoll.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prpollml.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prselect.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/prttools.h (100%) create mode 100644 nspr/pr/tests/pushtop.c rename {mozilla/nsprpub => nspr}/pr/tests/randseed.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ranfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/reinit.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/rmdir.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/runtests.pl (99%) rename {mozilla/nsprpub => nspr}/pr/tests/runtests.sh (99%) rename {mozilla/nsprpub => nspr}/pr/tests/runy2ktests.ksh (100%) rename {mozilla/nsprpub => nspr}/pr/tests/rwlocktest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sel_spd.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/selct_er.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/selct_nm.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/selct_to.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/select2.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/selintr.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sem.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sema.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/semaerr.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/semaerr1.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/semaping.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/semapong.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sendzlf.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/server_test.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/servr_kk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/servr_ku.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/servr_uk.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/servr_uu.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/short_thread.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sigpipe.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sleep.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/socket.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sockopt.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sockping.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sockpong.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sprintf.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sproc_ch.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/sproc_p.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/stack.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/stat.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/stdio.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/str2addr.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/strod.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/suspend.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/switch.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/system.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/testbit.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/testfile.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/threads.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/thrpool_client.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/thrpool_server.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/thruput.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/time.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/timemac.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/timetest.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/tmoacc.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/tmocon.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/tpd.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/udpsrv.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/ut_ttools.h (100%) rename {mozilla/nsprpub => nspr}/pr/tests/vercheck.c (90%) rename {mozilla/nsprpub => nspr}/pr/tests/version.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/writev.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/xnotify.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/y2k.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/y2ktmo.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/yield.c (100%) rename {mozilla/nsprpub => nspr}/pr/tests/zerolen.c (100%) rename {mozilla/nsprpub/lib => nspr/tools}/.cvsignore (100%) rename {mozilla/nsprpub => nspr}/tools/Makefile.in (84%) rename {mozilla/nsprpub => nspr}/tools/httpget.c (100%) rename {mozilla/nsprpub => nspr}/tools/tail.c (100%) diff --git a/mozilla/CVS/Entries b/mozilla/CVS/Entries deleted file mode 100644 index b4631b5..0000000 --- a/mozilla/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/nsprpub//// diff --git a/mozilla/CVS/Entries.Static b/mozilla/CVS/Entries.Static deleted file mode 100644 index e69de29..0000000 diff --git a/mozilla/CVS/Repository b/mozilla/CVS/Repository deleted file mode 100644 index 92187ab..0000000 --- a/mozilla/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla diff --git a/mozilla/CVS/Root b/mozilla/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/CVS/Tag b/mozilla/CVS/Tag deleted file mode 100644 index 489ff2d..0000000 --- a/mozilla/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_8_7_RTM diff --git a/mozilla/nsprpub/CVS/Entries b/mozilla/nsprpub/CVS/Entries deleted file mode 100644 index 4947003..0000000 --- a/mozilla/nsprpub/CVS/Entries +++ /dev/null @@ -1,15 +0,0 @@ -D/admin//// -D/build//// -D/config//// -D/lib//// -D/pkg//// -D/pr//// -D/tools//// -D/include//// -D/macbuild//// -/.cvsignore/1.2/Sat May 12 00:53:26 2001//TNSPR_4_8_RTM -/aclocal.m4/1.1/Fri Sep 24 18:10:19 2010//TNSPR_4_8_7_BETA1 -/LICENSE/1.1/Tue Mar 6 13:16:12 2012//TNSPR_4_9_1_RTM -/Makefile.in/1.26/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/configure/1.331/Tue Jul 24 08:48:27 2012//TNSPR_4_9_2_RTM -/configure.in/1.334/Tue Jul 24 08:48:27 2012//TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/CVS/Repository b/mozilla/nsprpub/CVS/Repository deleted file mode 100644 index 804c1bd..0000000 --- a/mozilla/nsprpub/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub diff --git a/mozilla/nsprpub/CVS/Root b/mozilla/nsprpub/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/CVS/Tag b/mozilla/nsprpub/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/admin/CVS/Entries b/mozilla/nsprpub/admin/CVS/Entries deleted file mode 100644 index ce7400c..0000000 --- a/mozilla/nsprpub/admin/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/explode.pl/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/makeTargetDirs.sh/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/symlinks.sh/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/repackage.sh/1.34/Tue Jul 24 08:48:27 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/admin/CVS/Repository b/mozilla/nsprpub/admin/CVS/Repository deleted file mode 100644 index a071ca1..0000000 --- a/mozilla/nsprpub/admin/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/admin diff --git a/mozilla/nsprpub/admin/CVS/Root b/mozilla/nsprpub/admin/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/admin/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/admin/CVS/Tag b/mozilla/nsprpub/admin/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/admin/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/admin/repackage.sh b/mozilla/nsprpub/admin/repackage.sh deleted file mode 100755 index 2f84803..0000000 --- a/mozilla/nsprpub/admin/repackage.sh +++ /dev/null @@ -1,179 +0,0 @@ -#! /bin/sh -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# ------------------------------------------------------------------ -# repackage.sh -- Repackage NSPR from /s/b/c to mozilla.org format -# -# syntax: repackage.sh -# -# Description: -# repackage.sh creates NSPR binary distributions for mozilla.org from -# the internal binary distributions in /share/builds/components/nspr20. -# There are reasons why we can't just push the internal binary distributions -# to mozilla.org. External developers prefer to use the common archive -# file format for their platforms, rather than the jar files we use internally. -# -# On Unix, we create a tar.gz file. On Windows, we create a zip file. -# For example: NSPR 4.1.1, these would be nspr-4.1.1.tar.gz and nspr-4.1.1.zip. -# -# When unpacked, nspr-4.1.1.tar.gz or nspr-4.1.1.zip should expand to a -# nspr-4.1.1 directory that contains three subdirectories: include, lib, -# and bin. The header files, with the correct line endings for the -# platform, are in nspr-4.1.1/include. The libraries are in nspr-4.1.1/lib. -# The executable programs are in nspr-4.1.1/bin. -# -# Note! Files written with Gnu tar are not readable by some non-Gnu -# versions. Sun, in particular. -# -# -# -# -# ------------------------------------------------------------------ - -FROMTOP=/share/builds/components/nspr20/v4.9.2 -TOTOP=./v4.9.2 -NSPRDIR=nspr-4.9.2 -SOURCETAG=NSPR_4_9_2_RTM - -# -# enumerate Unix object directories on /s/b/c -UNIX_OBJDIRS=" -HP-UXB.11.11_64_DBG.OBJ -HP-UXB.11.11_64_OPT.OBJ -HP-UXB.11.11_DBG.OBJ -HP-UXB.11.11_OPT.OBJ -HP-UXB.11.23_ia64_32_DBG.OBJ -HP-UXB.11.23_ia64_32_OPT.OBJ -HP-UXB.11.23_ia64_64_DBG.OBJ -HP-UXB.11.23_ia64_64_OPT.OBJ -Linux2.4_x86_glibc_PTH_DBG.OBJ -Linux2.4_x86_glibc_PTH_OPT.OBJ -Linux2.6_x86_64_glibc_PTH_DBG.OBJ -Linux2.6_x86_64_glibc_PTH_OPT.OBJ -Linux2.6_x86_glibc_PTH_DBG.OBJ -Linux2.6_x86_glibc_PTH_OPT.OBJ -SunOS5.9_64_DBG.OBJ -SunOS5.9_64_OPT.OBJ -SunOS5.9_DBG.OBJ -SunOS5.9_OPT.OBJ -" -# -# enumerate Windows object directories on /s/b/c -WIN_OBJDIRS=" -WIN954.0_DBG.OBJ -WIN954.0_DBG.OBJD -WIN954.0_OPT.OBJ -WINNT5.0_DBG.OBJ -WINNT5.0_DBG.OBJD -WINNT5.0_OPT.OBJ -" - -# -# Create the destination directory. -# -echo "removing directory $TOTOP" -rm -rf $TOTOP -echo "creating directory $TOTOP" -mkdir -p $TOTOP - -# -# Generate the tar.gz files for Unix platforms. -# -for OBJDIR in $UNIX_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "copying $FROMTOP/$OBJDIR/include" - cp -r $FROMTOP/$OBJDIR/include $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.tar" - tar cvf $TOTOP/$OBJDIR/$NSPRDIR.tar $NSPRDIR - echo "gzipping $TOTOP/$OBJDIR/$NSPRDIR.tar" - gzip $TOTOP/$OBJDIR/$NSPRDIR.tar -done - -# -# Generate the zip files for Windows platforms. -# -for OBJDIR in $WIN_OBJDIRS; do - echo "removing directory $NSPRDIR" - rm -rf $NSPRDIR - echo "creating directory $NSPRDIR" - mkdir $NSPRDIR - - echo "creating directory $NSPRDIR/include" - mkdir $NSPRDIR/include - echo "creating directory $NSPRDIR/include/private" - mkdir $NSPRDIR/include/private - echo "creating directory $NSPRDIR/include/obsolete" - mkdir $NSPRDIR/include/obsolete - - # copy headers and adjust unix line-end to Windows line-end - # Note: Watch out for the "sed" command line. - # when editing the command, take care to preserve the "^M" as the literal - # cntl-M character! in vi, use "cntl-v cntl-m" to enter it! - # - headers=`ls $FROMTOP/$OBJDIR/include/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/obsolete/`basename $header` - done - headers=`ls $FROMTOP/$OBJDIR/include/private/*.h` - for header in $headers; do - sed -e 's/$/ /g' $header > $NSPRDIR/include/private/`basename $header` - done - - echo "copying $FROMTOP/$OBJDIR/lib" - cp -r $FROMTOP/$OBJDIR/lib $NSPRDIR - - echo "copying $FROMTOP/$OBJDIR/bin" - cp -r $FROMTOP/$OBJDIR/bin $NSPRDIR - - echo "creating directory $TOTOP/$OBJDIR" - mkdir -p $TOTOP/$OBJDIR - echo "creating $TOTOP/$OBJDIR/$NSPRDIR.zip" - zip -r $TOTOP/$OBJDIR/$NSPRDIR.zip $NSPRDIR -done - -# -# package the source from CVS -# -echo "Packaging source" -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -echo "creating directory $NSPRDIR" -mkdir $NSPRDIR -myWD=`pwd` -cd $NSPRDIR -echo "Pulling source from CVS with tag $SOURCETAG" -cvs co -r $SOURCETAG mozilla/nsprpub -cd $myWD -mkdir $TOTOP/src -echo "Creating source tar file: $TOTOP/src/$NSPRDIR.tar" -tar cvf $TOTOP/src/$NSPRDIR.tar $NSPRDIR -echo "gzip $TOTOP/src/$NSPRDIR.tar" -gzip $TOTOP/src/$NSPRDIR.tar - -# -# Remove the working directory. -# -echo "removing directory $NSPRDIR" -rm -rf $NSPRDIR -# --- end repackage.sh --------------------------------------------- diff --git a/mozilla/nsprpub/build/CVS/Entries b/mozilla/nsprpub/build/CVS/Entries deleted file mode 100644 index 873e1d9..0000000 --- a/mozilla/nsprpub/build/CVS/Entries +++ /dev/null @@ -1,3 +0,0 @@ -D/autoconf//// -D/win32//// -/cygwin-wrapper/1.5/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/build/CVS/Repository b/mozilla/nsprpub/build/CVS/Repository deleted file mode 100644 index 44dd63a..0000000 --- a/mozilla/nsprpub/build/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/build diff --git a/mozilla/nsprpub/build/CVS/Root b/mozilla/nsprpub/build/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/build/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/build/CVS/Tag b/mozilla/nsprpub/build/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/build/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/build/autoconf/CVS/Entries b/mozilla/nsprpub/build/autoconf/CVS/Entries deleted file mode 100644 index 11ae20b..0000000 --- a/mozilla/nsprpub/build/autoconf/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/config.guess/1.17/Wed May 20 19:54:24 2009//TNSPR_4_8_RTM -/config.sub/1.20/Sat Feb 4 09:59:12 2012//TNSPR_4_9_BETA6 -/acwinpaths.m4/1.2/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/install-sh/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/build/autoconf/CVS/Repository b/mozilla/nsprpub/build/autoconf/CVS/Repository deleted file mode 100644 index 41ecae7..0000000 --- a/mozilla/nsprpub/build/autoconf/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/build/autoconf diff --git a/mozilla/nsprpub/build/autoconf/CVS/Root b/mozilla/nsprpub/build/autoconf/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/build/autoconf/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/build/autoconf/CVS/Tag b/mozilla/nsprpub/build/autoconf/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/build/autoconf/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/build/win32/CVS/Entries b/mozilla/nsprpub/build/win32/CVS/Entries deleted file mode 100644 index d8138f2..0000000 --- a/mozilla/nsprpub/build/win32/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/pgomerge.py/1.2/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/build/win32/CVS/Repository b/mozilla/nsprpub/build/win32/CVS/Repository deleted file mode 100644 index 47ba86a..0000000 --- a/mozilla/nsprpub/build/win32/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/build/win32 diff --git a/mozilla/nsprpub/build/win32/CVS/Root b/mozilla/nsprpub/build/win32/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/build/win32/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/build/win32/CVS/Tag b/mozilla/nsprpub/build/win32/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/build/win32/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/config/CVS/Entries b/mozilla/nsprpub/config/CVS/Entries deleted file mode 100644 index 82c982e..0000000 --- a/mozilla/nsprpub/config/CVS/Entries +++ /dev/null @@ -1,20 +0,0 @@ -/.cvsignore/3.5/Fri Jul 20 00:22:11 2001//TNSPR_4_8_RTM -/nspr.m4/1.4/Mon Jan 21 09:52:48 2008//TNSPR_4_8_RTM -/system-headers/3.2/Mon May 9 05:50:20 2005//TNSPR_4_8_RTM -/Makefile.in/1.26/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/autoconf.mk.in/1.46/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/config.mk/3.37/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/gcc_hidden.h/3.2/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/libc_r.h/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/make-system-wrappers.pl/3.2/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nfspwd.pl/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/now.c/3.16/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nsinstall.c/3.25/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nspr-config.in/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nspr.pc.in/1.1/Fri May 18 22:26:17 2012//TNSPR_4_9_1_RTM -/nsprincl.mk.in/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nsprincl.sh.in/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pathsub.h/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rules.mk/3.85/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prdepend.h/1.17/Tue Jul 24 08:48:27 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/config/CVS/Repository b/mozilla/nsprpub/config/CVS/Repository deleted file mode 100644 index 2bd699c..0000000 --- a/mozilla/nsprpub/config/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/config diff --git a/mozilla/nsprpub/config/CVS/Root b/mozilla/nsprpub/config/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/config/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/config/CVS/Tag b/mozilla/nsprpub/config/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/config/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/include/CVS/Entries b/mozilla/nsprpub/include/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/include/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/include/CVS/Repository b/mozilla/nsprpub/include/CVS/Repository deleted file mode 100644 index 359ba38..0000000 --- a/mozilla/nsprpub/include/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/include diff --git a/mozilla/nsprpub/include/CVS/Root b/mozilla/nsprpub/include/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/include/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/include/CVS/Tag b/mozilla/nsprpub/include/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/include/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/CVS/Entries b/mozilla/nsprpub/lib/CVS/Entries deleted file mode 100644 index 09f67bd..0000000 --- a/mozilla/nsprpub/lib/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -D/ds//// -D/libc//// -D/msgc//// -D/prstreams//// -D/tests//// -/.cvsignore/1.2/Sat May 12 01:02:30 2001//TNSPR_4_8_RTM -/Makefile.in/1.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/lib/CVS/Repository b/mozilla/nsprpub/lib/CVS/Repository deleted file mode 100644 index 85f298b..0000000 --- a/mozilla/nsprpub/lib/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib diff --git a/mozilla/nsprpub/lib/CVS/Root b/mozilla/nsprpub/lib/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/CVS/Tag b/mozilla/nsprpub/lib/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/ds/CVS/Entries b/mozilla/nsprpub/lib/ds/CVS/Entries deleted file mode 100644 index 43ca794..0000000 --- a/mozilla/nsprpub/lib/ds/CVS/Entries +++ /dev/null @@ -1,11 +0,0 @@ -/.cvsignore/1.3/Mon May 14 22:12:54 2001//TNSPR_4_8_RTM -/Makefile.in/1.39/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plarena.c/3.20/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plarena.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plarenas.h/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plds.def/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plds.rc/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plhash.c/3.14/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plhash.h/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plvrsion.c/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/lib/ds/CVS/Repository b/mozilla/nsprpub/lib/ds/CVS/Repository deleted file mode 100644 index 3923719..0000000 --- a/mozilla/nsprpub/lib/ds/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/ds diff --git a/mozilla/nsprpub/lib/ds/CVS/Root b/mozilla/nsprpub/lib/ds/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/ds/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/ds/CVS/Tag b/mozilla/nsprpub/lib/ds/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/ds/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/libc/CVS/Entries b/mozilla/nsprpub/lib/libc/CVS/Entries deleted file mode 100644 index 6bde891..0000000 --- a/mozilla/nsprpub/lib/libc/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -D/include//// -D/src//// -/.cvsignore/1.2/Sat May 12 01:13:53 2001//TNSPR_4_8_RTM -/README/3.1/Sat Mar 28 03:36:48 1998//TNSPR_4_8_RTM -/Makefile.in/1.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/lib/libc/CVS/Repository b/mozilla/nsprpub/lib/libc/CVS/Repository deleted file mode 100644 index 9a8bcca..0000000 --- a/mozilla/nsprpub/lib/libc/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/libc diff --git a/mozilla/nsprpub/lib/libc/CVS/Root b/mozilla/nsprpub/lib/libc/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/libc/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/libc/CVS/Tag b/mozilla/nsprpub/lib/libc/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/libc/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/libc/include/CVS/Entries b/mozilla/nsprpub/lib/libc/include/CVS/Entries deleted file mode 100644 index b4a6913..0000000 --- a/mozilla/nsprpub/lib/libc/include/CVS/Entries +++ /dev/null @@ -1,8 +0,0 @@ -/.cvsignore/1.2/Sat May 12 01:14:37 2001//TNSPR_4_8_RTM -/README/3.1/Sat Mar 28 03:36:48 1998//TNSPR_4_8_RTM -/Makefile.in/1.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plbase64.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plerror.h/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plgetopt.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plstr.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/lib/libc/include/CVS/Repository b/mozilla/nsprpub/lib/libc/include/CVS/Repository deleted file mode 100644 index dc074db..0000000 --- a/mozilla/nsprpub/lib/libc/include/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/libc/include diff --git a/mozilla/nsprpub/lib/libc/include/CVS/Root b/mozilla/nsprpub/lib/libc/include/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/libc/include/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/libc/include/CVS/Tag b/mozilla/nsprpub/lib/libc/include/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/libc/include/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/libc/src/CVS/Entries b/mozilla/nsprpub/lib/libc/src/CVS/Entries deleted file mode 100644 index 95f8e1a..0000000 --- a/mozilla/nsprpub/lib/libc/src/CVS/Entries +++ /dev/null @@ -1,20 +0,0 @@ -/.cvsignore/1.3/Mon May 14 22:11:59 2001//TNSPR_4_8_RTM -/README/3.1/Sat Mar 28 03:36:50 1998//TNSPR_4_8_RTM -/Makefile.in/1.36/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/base64.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plc.def/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plc.rc/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plerror.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plgetopt.c/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plvrsion.c/3.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strcase.c/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strcat.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strchr.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strcmp.c/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strcpy.c/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strdup.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strlen.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strpbrk.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strstr.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/strtok.c/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/lib/libc/src/CVS/Repository b/mozilla/nsprpub/lib/libc/src/CVS/Repository deleted file mode 100644 index bf9dc11..0000000 --- a/mozilla/nsprpub/lib/libc/src/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/libc/src diff --git a/mozilla/nsprpub/lib/libc/src/CVS/Root b/mozilla/nsprpub/lib/libc/src/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/libc/src/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/libc/src/CVS/Tag b/mozilla/nsprpub/lib/libc/src/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/libc/src/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/msgc/CVS/Entries b/mozilla/nsprpub/lib/msgc/CVS/Entries deleted file mode 100644 index 0e64458..0000000 --- a/mozilla/nsprpub/lib/msgc/CVS/Entries +++ /dev/null @@ -1,3 +0,0 @@ -D/include//// -D/src//// -D/tests//// diff --git a/mozilla/nsprpub/lib/msgc/CVS/Repository b/mozilla/nsprpub/lib/msgc/CVS/Repository deleted file mode 100644 index 83ce6a6..0000000 --- a/mozilla/nsprpub/lib/msgc/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/msgc diff --git a/mozilla/nsprpub/lib/msgc/CVS/Root b/mozilla/nsprpub/lib/msgc/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/msgc/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/msgc/CVS/Tag b/mozilla/nsprpub/lib/msgc/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/msgc/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/msgc/include/CVS/Entries b/mozilla/nsprpub/lib/msgc/include/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/lib/msgc/include/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/lib/msgc/include/CVS/Repository b/mozilla/nsprpub/lib/msgc/include/CVS/Repository deleted file mode 100644 index 70dcd11..0000000 --- a/mozilla/nsprpub/lib/msgc/include/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/msgc/include diff --git a/mozilla/nsprpub/lib/msgc/include/CVS/Root b/mozilla/nsprpub/lib/msgc/include/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/msgc/include/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/msgc/include/CVS/Tag b/mozilla/nsprpub/lib/msgc/include/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/msgc/include/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/msgc/src/CVS/Entries b/mozilla/nsprpub/lib/msgc/src/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/lib/msgc/src/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/lib/msgc/src/CVS/Repository b/mozilla/nsprpub/lib/msgc/src/CVS/Repository deleted file mode 100644 index fd9e9b4..0000000 --- a/mozilla/nsprpub/lib/msgc/src/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/msgc/src diff --git a/mozilla/nsprpub/lib/msgc/src/CVS/Root b/mozilla/nsprpub/lib/msgc/src/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/msgc/src/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/msgc/src/CVS/Tag b/mozilla/nsprpub/lib/msgc/src/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/msgc/src/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/msgc/tests/CVS/Entries b/mozilla/nsprpub/lib/msgc/tests/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/lib/msgc/tests/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/lib/msgc/tests/CVS/Repository b/mozilla/nsprpub/lib/msgc/tests/CVS/Repository deleted file mode 100644 index 94bf25f..0000000 --- a/mozilla/nsprpub/lib/msgc/tests/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/msgc/tests diff --git a/mozilla/nsprpub/lib/msgc/tests/CVS/Root b/mozilla/nsprpub/lib/msgc/tests/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/msgc/tests/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/msgc/tests/CVS/Tag b/mozilla/nsprpub/lib/msgc/tests/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/msgc/tests/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/prstreams/CVS/Entries b/mozilla/nsprpub/lib/prstreams/CVS/Entries deleted file mode 100644 index f2799f1..0000000 --- a/mozilla/nsprpub/lib/prstreams/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -D/tests//// -/.cvsignore/1.2/Sat May 12 06:36:32 2001//TNSPR_4_8_RTM -/Makefile.in/1.25/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/plvrsion.c/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prstrms.cpp/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prstrms.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prstrms.rc/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/lib/prstreams/CVS/Repository b/mozilla/nsprpub/lib/prstreams/CVS/Repository deleted file mode 100644 index f0fd2ee..0000000 --- a/mozilla/nsprpub/lib/prstreams/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/prstreams diff --git a/mozilla/nsprpub/lib/prstreams/CVS/Root b/mozilla/nsprpub/lib/prstreams/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/prstreams/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/prstreams/CVS/Tag b/mozilla/nsprpub/lib/prstreams/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/prstreams/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/prstreams/tests/CVS/Entries b/mozilla/nsprpub/lib/prstreams/tests/CVS/Entries deleted file mode 100644 index 8933900..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/testprstrm//// diff --git a/mozilla/nsprpub/lib/prstreams/tests/CVS/Repository b/mozilla/nsprpub/lib/prstreams/tests/CVS/Repository deleted file mode 100644 index bfd7669..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/prstreams/tests diff --git a/mozilla/nsprpub/lib/prstreams/tests/CVS/Root b/mozilla/nsprpub/lib/prstreams/tests/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/prstreams/tests/CVS/Tag b/mozilla/nsprpub/lib/prstreams/tests/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries deleted file mode 100644 index 9713af3..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/.cvsignore/1.2/Sat May 12 06:40:34 2001//TNSPR_4_8_RTM -/Makefile.in/1.16/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/testprstrm.cpp/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository deleted file mode 100644 index b4bf156..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/prstreams/tests/testprstrm diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Tag b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/tests/CVS/Entries b/mozilla/nsprpub/lib/tests/CVS/Entries deleted file mode 100644 index d724afa..0000000 --- a/mozilla/nsprpub/lib/tests/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -D/windows//// -/.cvsignore/1.2/Sat May 12 01:31:18 2001//TNSPR_4_8_RTM -/Makefile.in/1.26/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/arena.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/base64t.c/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/getopt.c/1.2/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/string.c/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/lib/tests/CVS/Repository b/mozilla/nsprpub/lib/tests/CVS/Repository deleted file mode 100644 index f376fbc..0000000 --- a/mozilla/nsprpub/lib/tests/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/tests diff --git a/mozilla/nsprpub/lib/tests/CVS/Root b/mozilla/nsprpub/lib/tests/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/tests/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/tests/CVS/Tag b/mozilla/nsprpub/lib/tests/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/lib/tests/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/lib/tests/windows/CVS/Entries b/mozilla/nsprpub/lib/tests/windows/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/lib/tests/windows/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/lib/tests/windows/CVS/Repository b/mozilla/nsprpub/lib/tests/windows/CVS/Repository deleted file mode 100644 index 2bd1605..0000000 --- a/mozilla/nsprpub/lib/tests/windows/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/lib/tests/windows diff --git a/mozilla/nsprpub/lib/tests/windows/CVS/Root b/mozilla/nsprpub/lib/tests/windows/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/lib/tests/windows/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/lib/tests/windows/CVS/Tag b/mozilla/nsprpub/lib/tests/windows/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/lib/tests/windows/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/macbuild/CVS/Entries b/mozilla/nsprpub/macbuild/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/macbuild/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/macbuild/CVS/Repository b/mozilla/nsprpub/macbuild/CVS/Repository deleted file mode 100644 index e617247..0000000 --- a/mozilla/nsprpub/macbuild/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/macbuild diff --git a/mozilla/nsprpub/macbuild/CVS/Root b/mozilla/nsprpub/macbuild/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/macbuild/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/macbuild/CVS/Tag b/mozilla/nsprpub/macbuild/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/macbuild/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/CVS/Entries b/mozilla/nsprpub/pkg/CVS/Entries deleted file mode 100644 index c90a4e5..0000000 --- a/mozilla/nsprpub/pkg/CVS/Entries +++ /dev/null @@ -1,3 +0,0 @@ -D/linux//// -D/solaris//// -/Makefile.in/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/pkg/CVS/Repository b/mozilla/nsprpub/pkg/CVS/Repository deleted file mode 100644 index 711b2c0..0000000 --- a/mozilla/nsprpub/pkg/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg diff --git a/mozilla/nsprpub/pkg/CVS/Root b/mozilla/nsprpub/pkg/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/CVS/Tag b/mozilla/nsprpub/pkg/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/linux/CVS/Entries b/mozilla/nsprpub/pkg/linux/CVS/Entries deleted file mode 100644 index b593fa6..0000000 --- a/mozilla/nsprpub/pkg/linux/CVS/Entries +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile.in/1.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/sun-nspr.spec/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pkg/linux/CVS/Repository b/mozilla/nsprpub/pkg/linux/CVS/Repository deleted file mode 100644 index 1036c28..0000000 --- a/mozilla/nsprpub/pkg/linux/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/linux diff --git a/mozilla/nsprpub/pkg/linux/CVS/Root b/mozilla/nsprpub/pkg/linux/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/linux/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/linux/CVS/Tag b/mozilla/nsprpub/pkg/linux/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/linux/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/CVS/Entries b/mozilla/nsprpub/pkg/solaris/CVS/Entries deleted file mode 100644 index c784a13..0000000 --- a/mozilla/nsprpub/pkg/solaris/CVS/Entries +++ /dev/null @@ -1,16 +0,0 @@ -D/SUNWpr//// -D/SUNWprd//// -D/SUNWprx//// -D/common_files//// -D/SUNWnspr//// -D/SUNWnsprx//// -D/SUNWpr-devl//// -D/SUNWprdx//// -D/SUNWprx-devl//// -/Makefile-devl.com/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/Makefile-devl.targ/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/Makefile.com/1.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/Makefile.in/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/Makefile.targ/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/bld_awk_pkginfo.ksh/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/proto64.mk/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/pkg/solaris/CVS/Repository b/mozilla/nsprpub/pkg/solaris/CVS/Repository deleted file mode 100644 index 76a0d11..0000000 --- a/mozilla/nsprpub/pkg/solaris/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris diff --git a/mozilla/nsprpub/pkg/solaris/CVS/Root b/mozilla/nsprpub/pkg/solaris/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/CVS/Tag b/mozilla/nsprpub/pkg/solaris/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/solaris/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository deleted file mode 100644 index e1c9ce9..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWnspr diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnspr/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository deleted file mode 100644 index 7c7c3ce..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWnsprx diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWnsprx/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository deleted file mode 100644 index f71d5bb..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWpr-devl diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr-devl/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Entries deleted file mode 100644 index 80bf749..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/Makefile.in/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/depend/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pkginfo.tmpl/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prototype_com/1.5/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prototype_i386/1.5/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prototype_sparc/1.5/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Repository deleted file mode 100644 index 058cb82..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWpr diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Entries deleted file mode 100644 index 4c35ede..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/Makefile.in/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/depend/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pkginfo.tmpl/1.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prototype/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Repository deleted file mode 100644 index 3ea4ab2..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWprd diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository deleted file mode 100644 index 9c91e38..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWprdx diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprdx/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository deleted file mode 100644 index f1a5a90..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWprx-devl diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx-devl/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Entries b/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Repository b/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Repository deleted file mode 100644 index 9ebb217..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/SUNWprx diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Root b/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Tag b/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Entries b/mozilla/nsprpub/pkg/solaris/common_files/CVS/Entries deleted file mode 100644 index 4d1fb52..0000000 --- a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/copyright/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Repository b/mozilla/nsprpub/pkg/solaris/common_files/CVS/Repository deleted file mode 100644 index 451c3e1..0000000 --- a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pkg/solaris/common_files diff --git a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Root b/mozilla/nsprpub/pkg/solaris/common_files/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Tag b/mozilla/nsprpub/pkg/solaris/common_files/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pkg/solaris/common_files/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/CVS/Entries b/mozilla/nsprpub/pr/CVS/Entries deleted file mode 100644 index 213e6c6..0000000 --- a/mozilla/nsprpub/pr/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -D/include//// -D/src//// -D/tests//// -/.cvsignore/1.2/Sat May 12 01:41:04 2001//TNSPR_4_8_RTM -/Makefile.in/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/pr/CVS/Repository b/mozilla/nsprpub/pr/CVS/Repository deleted file mode 100644 index 1bd6e93..0000000 --- a/mozilla/nsprpub/pr/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr diff --git a/mozilla/nsprpub/pr/CVS/Root b/mozilla/nsprpub/pr/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/CVS/Tag b/mozilla/nsprpub/pr/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/include/CVS/Entries b/mozilla/nsprpub/pr/include/CVS/Entries deleted file mode 100644 index b83cdbb..0000000 --- a/mozilla/nsprpub/pr/include/CVS/Entries +++ /dev/null @@ -1,46 +0,0 @@ -D/md//// -D/obsolete//// -D/private//// -/.cvsignore/1.2/Sat May 12 01:41:57 2001//TNSPR_4_8_RTM -/Makefile.in/1.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/gencfg.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nspr.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pratom.h/3.21/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prbit.h/3.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prclist.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prcmon.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prcountr.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prcvar.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prdtoa.h/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prenv.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prerr.h/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prerror.h/3.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prinet.h/3.19/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prinrval.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prio.h/3.45/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pripcsem.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlink.h/3.18/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlock.h/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlog.h/3.19/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlong.h/3.17/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmem.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmon.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmwait.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prnetdb.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prolock.h/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prpdce.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prprf.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prproces.h/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prrng.h/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prrwlock.h/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prshm.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prshma.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prsystem.h/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prtime.h/3.14/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prtpool.h/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prtrace.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prtypes.h/3.49/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prvrsion.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prwin16.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prinit.h/3.79/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -/prthread.h/3.16/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/include/CVS/Repository b/mozilla/nsprpub/pr/include/CVS/Repository deleted file mode 100644 index 9d53442..0000000 --- a/mozilla/nsprpub/pr/include/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/include diff --git a/mozilla/nsprpub/pr/include/CVS/Root b/mozilla/nsprpub/pr/include/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/include/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/include/CVS/Tag b/mozilla/nsprpub/pr/include/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/include/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/include/md/CVS/Entries b/mozilla/nsprpub/pr/include/md/CVS/Entries deleted file mode 100644 index 7175a4b..0000000 --- a/mozilla/nsprpub/pr/include/md/CVS/Entries +++ /dev/null @@ -1,72 +0,0 @@ -/.cvsignore/1.2/Sat May 12 01:47:58 2001//TNSPR_4_8_RTM -/Makefile.in/1.24/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_aix.h/3.17/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_aix32.cfg/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_aix64.cfg/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_beos.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_beos.h/3.26/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_bsdi.cfg/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_bsdi.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_darwin.cfg/3.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_darwin.h/3.26/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_dgux.cfg/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_dgux.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_freebsd.cfg/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_freebsd.h/3.23/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_hpux.h/3.25/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_hpux32.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_hpux64.cfg/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_irix.h/3.16/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_irix32.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_irix64.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_linux.cfg/3.28/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_linux.h/3.61/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_ncr.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_ncr.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nec.cfg/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nec.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_netbsd.cfg/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_netbsd.h/3.20/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nextstep.cfg/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nextstep.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nspr_pthread.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nto.cfg/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_nto.h/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_openbsd.cfg/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_openbsd.h/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_os2.cfg/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_os2.h/3.44/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_os2_errors.h/3.14/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_osf1.cfg/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_osf1.h/3.18/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_pcos.h/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_pth.h/3.39/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_qnx.cfg/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_qnx.h/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_reliantunix.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_reliantunix.h/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_riscos.cfg/3.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_riscos.h/3.4/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_scoos.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_scoos.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_solaris.cfg/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_solaris.h/3.31/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_sony.cfg/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_sony.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_sunos4.cfg/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_sunos4.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_symbian.cfg/1.5/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_symbian.h/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_unix_errors.h/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_unixos.h/3.42/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_unixware.cfg/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_unixware.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_unixware7.cfg/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_win32_errors.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_win95.cfg/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_winnt.cfg/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prosdep.h/3.23/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/sunos4.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/_win95.h/3.41/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -/_winnt.h/3.37/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/pr/include/md/CVS/Repository b/mozilla/nsprpub/pr/include/md/CVS/Repository deleted file mode 100644 index d181d24..0000000 --- a/mozilla/nsprpub/pr/include/md/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/include/md diff --git a/mozilla/nsprpub/pr/include/md/CVS/Root b/mozilla/nsprpub/pr/include/md/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/include/md/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/include/md/CVS/Tag b/mozilla/nsprpub/pr/include/md/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/include/md/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/include/md/_ncr.cfg b/mozilla/nsprpub/pr/include/md/_ncr.cfg deleted file mode 100644 index 2087045..0000000 --- a/mozilla/nsprpub/pr/include/md/_ncr.cfg +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef NCR -#define NCR -#endif - -#define IS_LITTLE_ENDIAN 1 -#undef IS_BIG_ENDIAN -#undef HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#undef HAVE_ALIGNED_LONGLONGS - -#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_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#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_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/mozilla/nsprpub/pr/include/md/_ncr.h b/mozilla/nsprpub/pr/include/md/_ncr.h deleted file mode 100644 index f8eaf28..0000000 --- a/mozilla/nsprpub/pr/include/md/_ncr.h +++ /dev/null @@ -1,198 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_unixware_defs_h___ -#define nspr_unixware_defs_h___ - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "ncr" -#define _PR_SI_SYSNAME "NCR" -#define _PR_SI_ARCHITECTURE "x86" -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 65536L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#define HAVE_DLL -#define USE_DLFCN -#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */ - -#if !defined (HAVE_STRERROR) -#define HAVE_STRERROR -#endif - -#ifndef HAVE_WEAK_IO_SYMBOLS -#define HAVE_WEAK_IO_SYMBOLS -#endif - -#define _PR_POLL_AVAILABLE -#define _PR_USE_POLL -#define _PR_NO_LARGE_FILES - -#undef HAVE_STACK_GROWING_UP -#define HAVE_NETCONFIG -#define NEED_STRFTIME_LOCK -#define NEED_TIME_R -#define NEED_LOCALTIME_R -#define NEED_GMTIME_R -#define NEED_ASCTIME_R -#define NEED_STRTOK_R -#define NEED_CTIME_R -#define _PR_NEED_STRCASECMP - -#define USE_SETJMP - -#include - -#define _SETJMP setjmp -#define _LONGJMP longjmp -#define _PR_CONTEXT_TYPE jmp_buf -#define _MD_GET_SP(_t) (_t)->md.context[4] -#define _PR_NUM_GCREGS _JBLEN - -#define CONTEXT(_th) ((_th)->md.context) - -/* -** Initialize the thread context preparing it to execute _main. -*/ -#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -{ \ - *status = PR_TRUE; \ - if(_SETJMP(CONTEXT(_thread))) (*_main)(); \ - _MD_GET_SP(_thread) = (int) ((_sp) - 128); \ -} - -#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); \ -} - -/* Machine-dependent (MD) data structures. - * Don't use SVR4 native threads (yet). - */ - -struct _MDThread { - _PR_CONTEXT_TYPE 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; -}; - -#define _MD_INIT_LOCKS() -#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 -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) -#define _MD_RESUME_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -/* - * We wrapped the select() call. _MD_SELECT refers to the built-in, - * unwrapped version. - */ -#include -#include -#include -extern int _select(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *execptfds, struct timeval *timeout); -#define _MD_SELECT _select - -#define _MD_POLL _poll -extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout); - -#endif /* nspr_ncr_defs_h */ diff --git a/mozilla/nsprpub/pr/include/md/_nec.cfg b/mozilla/nsprpub/pr/include/md/_nec.cfg deleted file mode 100644 index b4cc70f..0000000 --- a/mozilla/nsprpub/pr/include/md/_nec.cfg +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef NEC -#define NEC -#endif - -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 -#undef HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#undef HAVE_ALIGNED_LONGLONGS - -#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 8 -#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 - -#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/mozilla/nsprpub/pr/include/md/_nec.h b/mozilla/nsprpub/pr/include/md/_nec.h deleted file mode 100644 index 5297de4..0000000 --- a/mozilla/nsprpub/pr/include/md/_nec.h +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_nec_defs_h___ -#define nspr_nec_defs_h___ - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "nec" -#define _PR_SI_SYSNAME "NEC" -#define _PR_SI_ARCHITECTURE "mips" -#define PR_DLL_SUFFIX ".so" - -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 65536L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#undef HAVE_STACK_GROWING_UP -#define HAVE_DLL -#define USE_DLFCN -#define NEED_TIME_R -#define NEED_STRFTIME_LOCK -#define _PR_POLL_AVAILABLE -#define _PR_USE_POLL -#define _PR_NO_LARGE_FILES -#define _PR_STAT_HAS_ST_ATIM_UNION - -#include -#include - -#define PR_NUM_GCREGS NGREG -#define PR_CONTEXT_TYPE ucontext_t - -#define CONTEXT(_thread) (&(_thread)->md.context) - -#define _MD_GET_SP(_t) (_t)->md.context.uc_mcontext.gregs[CXT_SP] - -/* -** Initialize the thread context preparing it to execute "e(o,a)" -*/ -#define _MD_INIT_CONTEXT(thread, _sp, _main, status) \ -{ \ - *status = PR_TRUE; \ - getcontext(CONTEXT(thread)); \ - CONTEXT(thread)->uc_stack.ss_sp = (char*) (thread)->stack->stackBottom; \ - CONTEXT(thread)->uc_stack.ss_size = (thread)->stack->stackSize; \ - _MD_GET_SP(thread) = (greg_t) _sp - 64; \ - makecontext(CONTEXT(thread), _main, 0); \ -} - -#define _MD_SWITCH_CONTEXT(_thread) \ - if (!getcontext(CONTEXT(_thread))) { \ - (_thread)->md.errcode = errno; \ - _PR_Schedule(); \ - } - -/* -** Restore a thread context, saved by _MD_SWITCH_CONTEXT -*/ -#define _MD_RESTORE_CONTEXT(_thread) \ -{ \ - ucontext_t *uc = CONTEXT(_thread); \ - uc->uc_mcontext.gregs[CXT_V0] = 1; \ - uc->uc_mcontext.gregs[CXT_A3] = 0; \ - errno = (_thread)->md.errcode; \ - _MD_SET_CURRENT_THREAD(_thread); \ - setcontext(uc); \ -} - -/* Machine-dependent (MD) data structures */ - -struct _MDThread { - PR_CONTEXT_TYPE 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; -}; - -#define _MD_INIT_LOCKS() -#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() - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -#define _MD_SELECT _select -#define _MD_POLL _poll - -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -#endif /* nspr_nec_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/_nextstep.cfg b/mozilla/nsprpub/pr/include/md/_nextstep.cfg deleted file mode 100644 index 9648168..0000000 --- a/mozilla/nsprpub/pr/include/md/_nextstep.cfg +++ /dev/null @@ -1,223 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef NEXTSTEP -#define NEXTSTEP -#endif - -/* Platform specific -*/ -#if defined(__sparc__) - -/* Check these -*/ -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 -#define HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#define HAVE_ALIGNED_LONGLONGS 1 - -#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 -/* Taken from _solaris.cfg -*/ -#define PR_BYTES_PER_WORD 4 -#define PR_BYTES_PER_DWORD 8 -#define PR_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#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 -/* Taken from _solaris.cfg -*/ -#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 -/* Taken from _solaris.cfg -*/ -#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 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 4 - -#define PR_WORDS_PER_DWORD_LOG2 1 - -#elif defined(__m68k__) - -/* Check these -*/ -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 -#define HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#define HAVE_ALIGNED_LONGLONGS 1 - -#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_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#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 2 -#define PR_ALIGN_OF_LONG 2 -#define PR_ALIGN_OF_INT64 2 -#define PR_ALIGN_OF_FLOAT 2 -#define PR_ALIGN_OF_DOUBLE 2 -#define PR_ALIGN_OF_POINTER 2 - -#define PR_WORDS_PER_DWORD_LOG2 1 - -#elif defined(__i386__) - -/* Check these -*/ -#define IS_LITTLE_ENDIAN 1 -#undef IS_BIG_ENDIAN -#define HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#define HAVE_ALIGNED_LONGLONGS 1 - -#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 -#define PR_WORDS_PER_DWORD_LOG2 1 -#endif /* defined(__somearch__) */ - - -#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/mozilla/nsprpub/pr/include/md/_nextstep.h b/mozilla/nsprpub/pr/include/md/_nextstep.h deleted file mode 100644 index 329ff27..0000000 --- a/mozilla/nsprpub/pr/include/md/_nextstep.h +++ /dev/null @@ -1,267 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_nextstep_defs_h___ -#define nspr_nextstep_defs_h___ - -#include "prthread.h" - -#include -#include - -/* syscall() is not declared in NEXTSTEP's syscall.h ... -*/ -extern int syscall(int number, ...); - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "nextstep" -#define _PR_SI_SYSNAME "NEXTSTEP" -#if defined(__sparc__) -#define _PR_SI_ARCHITECTURE "sparc" -#elif defined(__m68k__) -#define _PR_SI_ARCHITECTURE "m68k" -#elif defined(__i386__) -#define _PR_SI_ARCHITECTURE "x86" -#else -error Unknown NEXTSTEP architecture -#endif -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 65536L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#undef HAVE_STACK_GROWING_UP - -#define HAVE_WEAK_MALLOC_SYMBOLS - -#define HAVE_DLL -#define USE_MACH_DYLD -#define _PR_STAT_HAS_ONLY_ST_ATIME -#define _PR_NO_LARGE_FILES - -#define USE_SETJMP - -#ifndef _PR_PTHREADS - -#include - -#define PR_CONTEXT_TYPE jmp_buf - -#define CONTEXT(_th) ((_th)->md.context) - -/* balazs.pataki@sztaki.hu: -** __sparc__ is checked -** __m68k__ is checked -** __i386__ is a guess (one of the two defines should work) -*/ -#if defined(__sparc__) -#define _MD_GET_SP(_th) (_th)->md.context[2] -#elif defined(__m68k__) -#define _MD_GET_SP(_th) (_th)->md.context[2] -#elif defined(__i386__) -/* One of this two must be OK ... try using sc_onstack -*/ -#define _MD_GET_SP(_th) (((struct sigcontext *) (_th)->md.context)->sc_onstack) -//#define _MD_GET_SP(_th) (_th)->md.context[0].sc_esp -#else -error Unknown NEXTSTEP architecture -#endif - -#define PR_NUM_GCREGS _JBLEN - -/* -** 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) = (int) ((_sp) - 64); \ -} - -#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); \ -} - -/* Machine-dependent (MD) data structures */ - -struct _MDThread { - PR_CONTEXT_TYPE 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; -}; - -#define _MD_INIT_LOCKS() -#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() - -extern PRStatus _MD_InitializeThread(PRThread *thread); - -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) _MD_suspend_thread -#define _MD_RESUME_THREAD(thread) _MD_resume_thread -#define _MD_CLEAN_THREAD(_thread) - -extern PRStatus _MD_CREATE_THREAD( - PRThread *thread, - void (*start) (void *), - PRThreadPriority priority, - PRThreadScope scope, - PRThreadState state, - PRUint32 stackSize); -extern void _MD_SET_PRIORITY(struct _MDThread *thread, PRUintn newPri); -extern PRStatus _MD_WAIT(PRThread *, PRIntervalTime timeout); -extern PRStatus _MD_WAKEUP_WAITER(PRThread *); -extern void _MD_YIELD(void); - -#endif /* ! _PR_PTHREADS */ - -extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -/* - * We wrapped the select() call. _MD_SELECT refers to the built-in, - * unwrapped version. - */ -#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) - -/* For writev() */ -#include - -/* signal.h */ -/* balazs.pataki@sztaki.hu: this is stolen from sunos4.h. The things is that -** NEXTSTEP doesn't support these flags for `struct sigaction's sa_flags, so -** I have to fake them ... -*/ -#define SA_RESTART 0 - -/* mmap */ -/* balazs.pataki@sztaki.hu: NEXTSTEP doesn't have mmap, at least not -** publically. We have sys/mman.h, but it doesn't declare mmap(), and -** PROT_NONE is also missing. syscall.h has entries for mmap, munmap, and -** mprotect so I wrap these in nextstep.c as mmap(), munmap() and mprotect() -** and pray for it to work. -** -*/ -caddr_t mmap(caddr_t addr, size_t len, int prot, int flags, - int fildes, off_t off); -int munmap(caddr_t addr, size_t len); -int mprotect(caddr_t addr, size_t len, int prot); - -/* my_mmap() is implemented in nextstep.c and is based on map_fd() of mach. -*/ -caddr_t my_mmap(caddr_t addr, size_t len, int prot, int flags, - int fildes, off_t off); -int my_munmap(caddr_t addr, size_t len); - - -/* string.h -*/ -/* balazs.pataki@sztaki.hu: this is missing so implemenetd in nextstep.c ... -*/ -char *strdup(const char *s1); - -/* unistd.h -*/ -/* balazs.pataki@sztaki.hu: these functions are hidden, though correctly -** implemented in NEXTSTEP. Here I give the declaration for them to be used -** by prmalloc.c, and I have a wrapped syscall() version of them in nextstep.c -*/ -int brk(void *endds); -void *sbrk(int incr); - -#endif /* nspr_nextstep_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/_reliantunix.cfg b/mozilla/nsprpub/pr/include/md/_reliantunix.cfg deleted file mode 100644 index 921d5eb..0000000 --- a/mozilla/nsprpub/pr/include/md/_reliantunix.cfg +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef RELIANTUNIX -#define RELIANTUNIX -#endif - -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 -#undef HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#undef HAVE_ALIGNED_LONGLONGS - -#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_WORD 4 -#define PR_BYTES_PER_DWORD 8 -#define PR_BYTES_PER_DOUBLE 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_WORD 32 -#define PR_BITS_PER_DWORD 64 -#define PR_BITS_PER_DOUBLE 64 - -#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_WORD_LOG2 5 -#define PR_BITS_PER_DWORD_LOG2 6 -#define PR_BITS_PER_DOUBLE_LOG2 6 - -#define PR_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 -#define PR_WORDS_PER_DWORD_LOG2 1 - -#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_WORD 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/mozilla/nsprpub/pr/include/md/_reliantunix.h b/mozilla/nsprpub/pr/include/md/_reliantunix.h deleted file mode 100644 index 03ce6de..0000000 --- a/mozilla/nsprpub/pr/include/md/_reliantunix.h +++ /dev/null @@ -1,238 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * reliantunix.h - * 5/18/96 Taken from nec.h -- chrisk@netscape.com - * 3/14/97 Modified for nspr20 -- chrisk@netscape.com - */ -#ifndef nspr_reliantunix_defs_h___ -#define nspr_reliantunix_defs_h___ - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "sinix" -#define _PR_SI_SYSNAME "SINIX" -#define _PR_SI_ARCHITECTURE "mips" -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE (2*65536L) -#define _MD_MMAP_FLAGS MAP_PRIVATE|MAP_FIXED - -#undef HAVE_STACK_GROWING_UP -#define HAVE_DLL -#define USE_DLFCN -#define NEED_STRFTIME_LOCK -#define NEED_TIME_R -#define HAVE_NETCONFIG -#define HAVE_WEAK_IO_SYMBOLS -#define HAVE_WEAK_MALLOC_SYMBOLS -#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */ -#define _PR_POLL_AVAILABLE -#define _PR_USE_POLL -#define _PR_STAT_HAS_ST_ATIM -#define _PR_NO_LARGE_FILES - -/* - * Mike Patnode indicated that it is possibly safe now to use context-switching - * calls that do not change the signal mask, like setjmp vs. sigsetjmp. - * So we'll use our homegrown, getcontext/setcontext-compatible stuff which - * will save us the getcontext/setcontext system calls at each context switch. - * It already works in FastTrack 2.01, so it should do it here :-) - * - chrisk 040497 - */ -#define USE_SETCXT /* temporarily disabled... */ - -#include - -#ifdef USE_SETCXT -/* use non-syscall machine language replacement */ -#define _GETCONTEXT getcxt -#define _SETCONTEXT setcxt -/* defined in os_ReliantUNIX.s */ -extern int getcxt(ucontext_t *); -extern int setcxt(ucontext_t *); -#else -#define _GETCONTEXT getcontext -#define _SETCONTEXT setcontext -#endif - -#define _MD_GET_SP(_t) (_t)->md.context.uc_mcontext.gpregs[CXT_SP] -#define _PR_CONTEXT_TYPE ucontext_t -#define _PR_NUM_GCREGS NGREG - -#define CONTEXT(_thread) (&(_thread)->md.context) - -#define _PR_IS_NATIVE_THREAD_SUPPORTED() 0 - -/* -** Machine-dependent (MD) data structures. -*/ -struct _MDThread { - _PR_CONTEXT_TYPE 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; -}; - -#define _MD_INIT_LOCKS() -#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() - -/* -** Initialize the thread context preparing it to execute "_main()" -** - get a nice, fresh context -** - set its SP to the stack we allcoated for it -** - set it to start things at "e" -*/ -#define _MD_INIT_CONTEXT(thread, _sp, _main, status) \ - PR_BEGIN_MACRO \ - *status = PR_TRUE; \ - _GETCONTEXT(CONTEXT(thread)); \ - /* this is supposed to point to the stack BASE, not to SP */ \ - CONTEXT(thread)->uc_stack.ss_sp = thread->stack->stackBottom; \ - CONTEXT(thread)->uc_stack.ss_size = thread->stack->stackSize; \ - CONTEXT(thread)->uc_mcontext.gpregs[CXT_SP] = ((unsigned long)_sp - 128) & 0xfffffff8; \ - CONTEXT(thread)->uc_mcontext.gpregs[CXT_T9] = _main; \ - CONTEXT(thread)->uc_mcontext.gpregs[CXT_EPC] = _main; \ - CONTEXT(thread)->uc_mcontext.gpregs[CXT_RA] = 0; \ - thread->no_sched = 0; \ - PR_END_MACRO - -/* -** Save current context as it is scheduled away -*/ -#define _MD_SWITCH_CONTEXT(_thread) \ - PR_BEGIN_MACRO \ - if (!_GETCONTEXT(CONTEXT(_thread))) { \ - _MD_SAVE_ERRNO(_thread); \ - _MD_SET_LAST_THREAD(_thread); \ - _PR_Schedule(); \ - } \ - PR_END_MACRO - -/* -** Restore a thread context, saved by _MD_SWITCH_CONTEXT or set up -** by _MD_INIT_CONTEXT -** CXT_V0 is the register that holds the return value. -** We must set it to 1 so that we can see if the return from -** getcontext() is the result of calling getcontext() or -** setcontext()... -** setting a context got with getcontext() appears to -** return from getcontext(), too! -** CXT_A3 is the register that holds status when returning -** from a syscall. It is set to 0 to indicate success, -** because we want getcontext() on the other side of the magic -** door to be ok. -*/ -#define _MD_RESTORE_CONTEXT(_thread) \ - PR_BEGIN_MACRO \ - ucontext_t *uc = CONTEXT(_thread); \ - uc->uc_mcontext.gpregs[CXT_V0] = 1;\ - uc->uc_mcontext.gpregs[CXT_A3] = 0;\ - _MD_RESTORE_ERRNO(_thread); \ - _MD_SET_CURRENT_THREAD(_thread); \ - _SETCONTEXT(uc); \ - PR_END_MACRO - -#define _MD_SAVE_ERRNO(t) (t)->md.errcode = errno; -#define _MD_RESTORE_ERRNO(t) errno = (t)->md.errcode; - -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) -#define _MD_RESUME_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -#if !defined(S_ISSOCK) && defined(S_IFSOCK) -#define S_ISSOCK(mode) ((mode&0xF000) == 0xC000) -#endif -#if !defined(S_ISLNK) && defined(S_IFLNK) -#define S_ISLNK(mode) ((mode&0xA000) == 0xC000) -#endif - -#include -#include -#include -extern int _select(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *execptfds, struct timeval *timeout); -#define _MD_SELECT(nfds,r,w,e,tv) _select(nfds,r,w,e,tv) -#define _MD_POLL _poll - -#endif /* nspr_reliantunix_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/_sony.cfg b/mozilla/nsprpub/pr/include/md/_sony.cfg deleted file mode 100644 index f3e68f7..0000000 --- a/mozilla/nsprpub/pr/include/md/_sony.cfg +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef SONY -#define SONY -#endif - -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 - -#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 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 4 - -#define PR_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#undef HAVE_LONG_LONG -#undef HAVE_ALIGNED_DOUBLES -#undef HAVE_ALIGNED_LONGLONGS - -#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/mozilla/nsprpub/pr/include/md/_sony.h b/mozilla/nsprpub/pr/include/md/_sony.h deleted file mode 100644 index 329a4d7..0000000 --- a/mozilla/nsprpub/pr/include/md/_sony.h +++ /dev/null @@ -1,172 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_sony_defs_h___ -#define nspr_sony_defs_h___ - -#define PR_LINKER_ARCH "sony" -#define _PR_SI_SYSNAME "SONY" -#define _PR_SI_ARCHITECTURE "mips" -#define PR_DLL_SUFFIX ".so" - -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 65536L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -#if defined(_PR_LOCAL_THREADS_ONLY) -#include -#include - -#define PR_NUM_GCREGS NGREG -#define PR_CONTEXT_TYPE ucontext_t - -#define CONTEXT(_thread) (&(_thread)->md.context) - -#define _MD_GET_SP(_t) (_t)->md.context.uc_mcontext.gregs[CXT_SP] - -/* -** Initialize the thread context preparing it to execute _main() -*/ -#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ -{ \ - *status = PR_TRUE; \ - getcontext(CONTEXT(_thread)); \ - CONTEXT(_thread)->uc_stack.ss_sp = (char*) (_thread)->stack->stackBottom; \ - CONTEXT(_thread)->uc_stack.ss_size = (_thread)->stack->stackSize; \ - _MD_GET_SP(_thread) = (greg_t) (_sp) - 64; \ - makecontext(CONTEXT(_thread), _main, 0); \ -} - -#define _MD_SWITCH_CONTEXT(_thread) \ - if (!getcontext(CONTEXT(_thread))) { \ - (_thread)->md.errcode = errno; \ - _PR_Schedule(); \ - } - -/* -** Restore a thread context, saved by _MD_SWITCH_CONTEXT -*/ -#define _MD_RESTORE_CONTEXT(_thread) \ -{ \ - ucontext_t *uc = CONTEXT(_thread); \ - uc->uc_mcontext.gregs[CXT_V0] = 1; \ - uc->uc_mcontext.gregs[CXT_A3] = 0; \ - _MD_SET_CURRENT_THREAD(_thread); \ - errno = (_thread)->md.errcode; \ - setcontext(uc); \ -} - -/* Machine-dependent (MD) data structures */ - -struct _MDThread { - PR_CONTEXT_TYPE 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; -}; - -#define _MD_INIT_LOCKS() -#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() - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#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 - -#include -extern int _poll(struct pollfd *fds, unsigned long nfds, int timeout); -#define _MD_POLL _poll - -#endif /* _PR_LOCAL_THREADS_ONLY */ - -#undef HAVE_STACK_GROWING_UP -#define HAVE_DLL -#define USE_DLFCN -#define NEED_TIME_R -#define NEED_STRFTIME_LOCK - -/* -** Missing function prototypes -*/ -extern int gethostname(char *name, int namelen); - -#endif /* nspr_sony_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/_sunos4.cfg b/mozilla/nsprpub/pr/include/md/_sunos4.cfg deleted file mode 100644 index d97ee03..0000000 --- a/mozilla/nsprpub/pr/include/md/_sunos4.cfg +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_cpucfg___ -#define nspr_cpucfg___ - -#ifndef XP_UNIX -#define XP_UNIX -#endif - -#ifndef SUNOS4 -#define SUNOS4 -#endif - -#undef IS_LITTLE_ENDIAN -#define IS_BIG_ENDIAN 1 -#undef HAVE_LONG_LONG -#define HAVE_ALIGNED_DOUBLES -#undef HAVE_ALIGNED_LONGLONGS - -#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_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#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 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 4 - -#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 /* ifndef nspr_cpucfg___ */ diff --git a/mozilla/nsprpub/pr/include/md/_sunos4.h b/mozilla/nsprpub/pr/include/md/_sunos4.h deleted file mode 100644 index 3b254b2..0000000 --- a/mozilla/nsprpub/pr/include/md/_sunos4.h +++ /dev/null @@ -1,204 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef nspr_sunos_defs_h___ -#define nspr_sunos_defs_h___ - -#include "md/sunos4.h" - -/* On SunOS 4, memset is declared in memory.h */ -#include -#include -#include - -/* - * Internal configuration macros - */ - -#define PR_LINKER_ARCH "sunos" -#define _PR_SI_SYSNAME "SUNOS" -#define _PR_SI_ARCHITECTURE "sparc" -#define PR_DLL_SUFFIX ".so.1.0" - -/* -** For sunos type machines, don't specify an address because the -** NetBSD/SPARC O.S. does the wrong thing. -*/ -#define _PR_VMBASE 0x30000000 -#define _PR_STACK_VMBASE 0x50000000 -#define _MD_DEFAULT_STACK_SIZE 65536L -#define _MD_MMAP_FLAGS MAP_PRIVATE - -#undef HAVE_STACK_GROWING_UP -#undef HAVE_WEAK_IO_SYMBOLS -#undef HAVE_WEAK_MALLOC_SYMBOLS -#define HAVE_DLL -#define USE_DLFCN -#define NEED_STRFTIME_LOCK -#define NEED_TIME_R -#define HAVE_BSD_FLOCK -#define _PR_NO_LARGE_FILES -#define _PR_STAT_HAS_ONLY_ST_ATIME - -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond - -#define USE_SETJMP - -#include - -#define _MD_GET_SP(_t) (_t)->md.context[2] - -#define PR_NUM_GCREGS _JBLEN - -#define CONTEXT(_th) ((_th)->md.context) - -/* -** Initialize the thread context preparing it to execute _main. -*/ -#define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ - PR_BEGIN_MACRO \ - int *context = (_thread)->md.context; \ - *status = PR_TRUE; \ - asm("ta 3"); \ - (void) setjmp(context); \ - (_thread)->md.context[2] = (int) ((_sp) - 64); \ - (_thread)->md.context[2] &= ~7; \ - (_thread)->md.context[3] = (int) _main; \ - (_thread)->md.context[4] = (int) _main + 4; \ - PR_END_MACRO - -#define _MD_SWITCH_CONTEXT(_thread) \ - asm("ta 3"); \ - 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); \ -} - -#pragma unknown_control_flow(longjmp) -#pragma unknown_control_flow(setjmp) -#pragma unknown_control_flow(_PR_Schedule) - -/* -** Missing function prototypes -*/ - -extern int socket (int domain, int type, int protocol); -extern int getsockname (int s, struct sockaddr *name, int *namelen); -extern int getpeername (int s, struct sockaddr *name, int *namelen); -extern int getsockopt (int s, int level, int optname, char* optval, int* optlen); -extern int setsockopt (int s, int level, int optname, const char* optval, int optlen); -extern int accept (int s, struct sockaddr *addr, int *addrlen); -extern int listen (int s, int backlog); -extern int brk(void *); -extern void *sbrk(int); - - -/* Machine-dependent (MD) data structures. SunOS 4 has no native threads. */ - -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; -}; - -#define _MD_INIT_LOCKS() -#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() - -/* These are copied from _solaris.h */ - -#define _MD_EARLY_INIT _MD_EarlyInit -#define _MD_FINAL_INIT _PR_UnixInit -#define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) -#define _MD_INIT_THREAD _MD_InitializeThread -#define _MD_EXIT_THREAD(thread) -#define _MD_SUSPEND_THREAD(thread) -#define _MD_RESUME_THREAD(thread) -#define _MD_CLEAN_THREAD(_thread) - -/* - * We wrapped the select() call. _MD_SELECT refers to the built-in, - * unwrapped version. - */ -#define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) -#define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout) - -#endif /* nspr_sparc_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/sunos4.h b/mozilla/nsprpub/pr/include/md/sunos4.h deleted file mode 100644 index cab5713..0000000 --- a/mozilla/nsprpub/pr/include/md/sunos4.h +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef pr_sunos4_h___ -#define pr_sunos4_h___ - -#ifndef SVR4 - -/* -** Hodge podge of random missing prototypes for the Sunos4 system -*/ -#include -#include -#include -#include -#include - -#define PATH_MAX _POSIX_PATH_MAX - -struct timeval; -struct timezone; -struct itimerval; -struct sockaddr; -struct stat; -struct tm; - -/* ctype.h */ -extern int tolower(int); -extern int toupper(int); - -/* errno.h */ -extern char *sys_errlist[]; -extern int sys_nerr; - -#define strerror(e) sys_errlist[((unsigned)(e) < sys_nerr) ? e : 0] - -extern void perror(const char *); - -/* getopt */ -extern char *optarg; -extern int optind; -extern int getopt(int argc, char **argv, char *spec); - -/* math.h */ -extern int srandom(long val); -extern long random(void); - -/* memory.h */ -#define memmove(to,from,len) bcopy((char*)(from),(char*)(to),len) - -extern void bcopy(const char *, char *, int); - -/* signal.h */ -/* -** SunOS4 sigaction hides interrupts by default, so we can safely define -** SA_RESTART to 0. -*/ -#define SA_RESTART 0 - -/* stdio.h */ -extern int printf(const char *, ...); -extern int fprintf(FILE *, const char *, ...); -extern int vprintf(const char *, va_list); -extern int vfprintf(FILE *, const char *, va_list); -extern char *vsprintf(char *, const char *, va_list); -extern int scanf(const char *, ...); -extern int sscanf(const char *, const char *, ...); -extern int fscanf(FILE *, const char *, ...); -extern int fgetc(FILE *); -extern int fputc(int, FILE *); -extern int fputs(const char *, FILE *); -extern int puts(const char *); -extern int fread(void *, size_t, size_t, FILE *); -extern int fwrite(const char *, int, int, FILE *); -extern int fseek(FILE *, long, int); -extern long ftell(FILE *); -extern int rewind(FILE *); -extern int fflush(FILE *); -extern int _flsbuf(unsigned char, FILE *); -extern int fclose(FILE *); -extern int remove(const char *); -extern int setvbuf(FILE *, char *, int, size_t); -extern int system(const char *); -extern FILE *popen(const char *, const char *); -extern int pclose(FILE *); - -/* stdlib.h */ -#define strtoul strtol - -extern int isatty(int fildes); -extern long strtol(const char *, char **, int); -extern int putenv(const char *); -extern void srand48(long); -extern long lrand48(void); -extern double drand48(void); - -/* string.h */ -extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, size_t); -extern int strcoll(const char *, const char *); - -/* time.h */ -extern time_t mktime(struct tm *); -extern size_t strftime(char *, size_t, const char *, const struct tm *); -extern int gettimeofday(struct timeval *, struct timezone *); -extern int setitimer(int, struct itimerval *, struct itimerval *); -extern time_t time(time_t *); -extern time_t timegm(struct tm *); -extern struct tm *localtime(const time_t *); -extern struct tm *gmtime(const time_t *); - -/* unistd.h */ -extern int rename(const char *, const char *); -extern int ioctl(int, int, int *arg); -extern int connect(int, struct sockaddr *, int); -extern int readlink(const char *, char *, int); -extern int symlink(const char *, const char *); -extern int ftruncate(int, off_t); -extern int fchmod(int, mode_t); -extern int fchown(int, uid_t, gid_t); -extern int lstat(const char *, struct stat *); -extern int fstat(int, struct stat *); -extern int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); -extern int gethostname(char *, int); -extern char *getwd(char *); -extern int getpagesize(void); - -#endif /* SVR4 */ - -#endif /* pr_sunos4_h___ */ diff --git a/mozilla/nsprpub/pr/include/obsolete/CVS/Entries b/mozilla/nsprpub/pr/include/obsolete/CVS/Entries deleted file mode 100644 index 199e4fd..0000000 --- a/mozilla/nsprpub/pr/include/obsolete/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/.cvsignore/1.2/Sat May 12 01:58:29 2001//TNSPR_4_8_RTM -/Makefile.in/1.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pralarm.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/probslet.h/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/protypes.h/3.25/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prsem.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/include/obsolete/CVS/Repository b/mozilla/nsprpub/pr/include/obsolete/CVS/Repository deleted file mode 100644 index c7a12d7..0000000 --- a/mozilla/nsprpub/pr/include/obsolete/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/include/obsolete diff --git a/mozilla/nsprpub/pr/include/obsolete/CVS/Root b/mozilla/nsprpub/pr/include/obsolete/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/include/obsolete/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/include/obsolete/CVS/Tag b/mozilla/nsprpub/pr/include/obsolete/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/include/obsolete/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/include/private/CVS/Entries b/mozilla/nsprpub/pr/include/private/CVS/Entries deleted file mode 100644 index ab848a5..0000000 --- a/mozilla/nsprpub/pr/include/private/CVS/Entries +++ /dev/null @@ -1,8 +0,0 @@ -/.cvsignore/1.2/Sat May 12 02:03:58 2001//TNSPR_4_8_RTM -/Makefile.in/1.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pprio.h/3.19/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pprmwait.h/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pprthred.h/3.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prpriv.h/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/primpl.h/3.95/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/pr/include/private/CVS/Repository b/mozilla/nsprpub/pr/include/private/CVS/Repository deleted file mode 100644 index 72ab5d1..0000000 --- a/mozilla/nsprpub/pr/include/private/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/include/private diff --git a/mozilla/nsprpub/pr/include/private/CVS/Root b/mozilla/nsprpub/pr/include/private/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/include/private/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/include/private/CVS/Tag b/mozilla/nsprpub/pr/include/private/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/include/private/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/CVS/Entries b/mozilla/nsprpub/pr/src/CVS/Entries deleted file mode 100644 index b39bd12..0000000 --- a/mozilla/nsprpub/pr/src/CVS/Entries +++ /dev/null @@ -1,17 +0,0 @@ -D/bthreads//// -D/cplus//// -D/io//// -D/linking//// -D/malloc//// -D/md//// -D/memory//// -D/misc//// -D/pthreads//// -D/threads//// -D/cthreads//// -/.cvsignore/1.3/Mon May 14 22:10:58 2001//TNSPR_4_8_RTM -/Makefile.in/1.62/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nspr.rc/3.13/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/os2extra.def/1.3/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prvrsion.c/3.17/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/nspr.def/1.20/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/CVS/Repository b/mozilla/nsprpub/pr/src/CVS/Repository deleted file mode 100644 index 126ccc2..0000000 --- a/mozilla/nsprpub/pr/src/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src diff --git a/mozilla/nsprpub/pr/src/CVS/Root b/mozilla/nsprpub/pr/src/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/CVS/Tag b/mozilla/nsprpub/pr/src/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/bthreads/CVS/Entries b/mozilla/nsprpub/pr/src/bthreads/CVS/Entries deleted file mode 100644 index 2bc726b..0000000 --- a/mozilla/nsprpub/pr/src/bthreads/CVS/Entries +++ /dev/null @@ -1,11 +0,0 @@ -/.cvsignore/1.2/Sat May 12 06:00:27 2001//TNSPR_4_8_RTM -/Makefile.in/1.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/bsrcs.mk/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btcvar.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btlocks.c/3.9/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btmisc.c/3.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btmon.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btsem.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/btthread.c/3.10/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/objs.mk/3.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/bthreads/CVS/Repository b/mozilla/nsprpub/pr/src/bthreads/CVS/Repository deleted file mode 100644 index efa19e8..0000000 --- a/mozilla/nsprpub/pr/src/bthreads/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/bthreads diff --git a/mozilla/nsprpub/pr/src/bthreads/CVS/Root b/mozilla/nsprpub/pr/src/bthreads/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/bthreads/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/bthreads/CVS/Tag b/mozilla/nsprpub/pr/src/bthreads/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/bthreads/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/cplus/CVS/Entries b/mozilla/nsprpub/pr/src/cplus/CVS/Entries deleted file mode 100644 index b8781ee..0000000 --- a/mozilla/nsprpub/pr/src/cplus/CVS/Entries +++ /dev/null @@ -1,25 +0,0 @@ -D/tests//// -/.cvsignore/1.2/Sat May 12 06:01:46 2001//TNSPR_4_8_RTM -/Makefile.in/1.11/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcascii.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcbase.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcbase.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rccv.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rccv.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcfileio.cpp/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcfileio.h/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcinrval.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcinrval.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcio.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcio.h/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rclock.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rclock.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcmon.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcnetdb.cpp/1.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcnetdb.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcnetio.cpp/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcnetio.h/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcthread.cpp/1.7/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rcthread.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rctime.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/rctime.h/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/pr/src/cplus/CVS/Repository b/mozilla/nsprpub/pr/src/cplus/CVS/Repository deleted file mode 100644 index 4217723..0000000 --- a/mozilla/nsprpub/pr/src/cplus/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/cplus diff --git a/mozilla/nsprpub/pr/src/cplus/CVS/Root b/mozilla/nsprpub/pr/src/cplus/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/cplus/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/cplus/CVS/Tag b/mozilla/nsprpub/pr/src/cplus/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/cplus/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Entries b/mozilla/nsprpub/pr/src/cplus/tests/CVS/Entries deleted file mode 100644 index 8609aca..0000000 --- a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Entries +++ /dev/null @@ -1,10 +0,0 @@ -/.cvsignore/1.2/Sat May 12 06:06:48 2001//TNSPR_4_8_RTM -/Makefile.in/1.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/fileio.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/interval.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/ranfile.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/switch.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/thread.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/time.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/tpd.cpp/1.6/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Repository b/mozilla/nsprpub/pr/src/cplus/tests/CVS/Repository deleted file mode 100644 index a9d952f..0000000 --- a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/cplus/tests diff --git a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Root b/mozilla/nsprpub/pr/src/cplus/tests/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Tag b/mozilla/nsprpub/pr/src/cplus/tests/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/cplus/tests/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/cthreads/CVS/Entries b/mozilla/nsprpub/pr/src/cthreads/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pr/src/cthreads/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pr/src/cthreads/CVS/Repository b/mozilla/nsprpub/pr/src/cthreads/CVS/Repository deleted file mode 100644 index 6029f5e..0000000 --- a/mozilla/nsprpub/pr/src/cthreads/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/cthreads diff --git a/mozilla/nsprpub/pr/src/cthreads/CVS/Root b/mozilla/nsprpub/pr/src/cthreads/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/cthreads/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/cthreads/CVS/Tag b/mozilla/nsprpub/pr/src/cthreads/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pr/src/cthreads/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/io/CVS/Entries b/mozilla/nsprpub/pr/src/io/CVS/Entries deleted file mode 100644 index 9819010..0000000 --- a/mozilla/nsprpub/pr/src/io/CVS/Entries +++ /dev/null @@ -1,19 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:14:49 2001//TNSPR_4_8_RTM -/Makefile.in/1.15/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prdir.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prfdcach.c/3.16/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prfile.c/3.48/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prio.c/3.24/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/priometh.c/3.20/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/pripv6.c/3.14/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlayer.c/3.21/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prlog.c/3.55/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmapopt.c/3.22/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmmap.c/3.8/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prmwait.c/3.21/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prpolevt.c/3.18/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prprf.c/3.23/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prscanf.c/3.12/Fri Jun 1 14:48:44 2012//TNSPR_4_9_1_RTM -/prsocket.c/3.65/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prstdio.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/io/CVS/Repository b/mozilla/nsprpub/pr/src/io/CVS/Repository deleted file mode 100644 index 3c200cb..0000000 --- a/mozilla/nsprpub/pr/src/io/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/io diff --git a/mozilla/nsprpub/pr/src/io/CVS/Root b/mozilla/nsprpub/pr/src/io/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/io/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/io/CVS/Tag b/mozilla/nsprpub/pr/src/io/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/io/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/linking/CVS/Entries b/mozilla/nsprpub/pr/src/linking/CVS/Entries deleted file mode 100644 index 0dacc92..0000000 --- a/mozilla/nsprpub/pr/src/linking/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:20:22 2001//TNSPR_4_8_RTM -/Makefile.in/1.20/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prlink.c/3.112/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/linking/CVS/Repository b/mozilla/nsprpub/pr/src/linking/CVS/Repository deleted file mode 100644 index 5c629be..0000000 --- a/mozilla/nsprpub/pr/src/linking/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/linking diff --git a/mozilla/nsprpub/pr/src/linking/CVS/Root b/mozilla/nsprpub/pr/src/linking/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/linking/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/linking/CVS/Tag b/mozilla/nsprpub/pr/src/linking/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/linking/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/malloc/CVS/Entries b/mozilla/nsprpub/pr/src/malloc/CVS/Entries deleted file mode 100644 index 2b98042..0000000 --- a/mozilla/nsprpub/pr/src/malloc/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:22:54 2001//TNSPR_4_8_RTM -/Makefile.in/1.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prmalloc.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prmem.c/3.21/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/malloc/CVS/Repository b/mozilla/nsprpub/pr/src/malloc/CVS/Repository deleted file mode 100644 index e17df4d..0000000 --- a/mozilla/nsprpub/pr/src/malloc/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/malloc diff --git a/mozilla/nsprpub/pr/src/malloc/CVS/Root b/mozilla/nsprpub/pr/src/malloc/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/malloc/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/malloc/CVS/Tag b/mozilla/nsprpub/pr/src/malloc/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/malloc/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/CVS/Entries b/mozilla/nsprpub/pr/src/md/CVS/Entries deleted file mode 100644 index e43ccf0..0000000 --- a/mozilla/nsprpub/pr/src/md/CVS/Entries +++ /dev/null @@ -1,8 +0,0 @@ -D/beos//// -D/mac//// -D/os2//// -D/unix//// -D/windows//// -/.cvsignore/1.2/Sat May 12 04:24:53 2001//TNSPR_4_8_RTM -/Makefile.in/1.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prosdep.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM diff --git a/mozilla/nsprpub/pr/src/md/CVS/Repository b/mozilla/nsprpub/pr/src/md/CVS/Repository deleted file mode 100644 index 2e602d5..0000000 --- a/mozilla/nsprpub/pr/src/md/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md diff --git a/mozilla/nsprpub/pr/src/md/CVS/Root b/mozilla/nsprpub/pr/src/md/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/CVS/Tag b/mozilla/nsprpub/pr/src/md/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/md/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/beos/CVS/Entries b/mozilla/nsprpub/pr/src/md/beos/CVS/Entries deleted file mode 100644 index a5e0146..0000000 --- a/mozilla/nsprpub/pr/src/md/beos/CVS/Entries +++ /dev/null @@ -1,17 +0,0 @@ -/.cvsignore/1.2/Sat May 12 06:08:09 2001//TNSPR_4_8_RTM -/Makefile.in/1.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bcpu.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/beos.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/beos_errors.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bfile.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bmemory.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bmisc.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bmmap.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bnet.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bproc.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/brng.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bseg.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bsrcs.mk/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/btime.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/objs.mk/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/md/beos/CVS/Repository b/mozilla/nsprpub/pr/src/md/beos/CVS/Repository deleted file mode 100644 index e728971..0000000 --- a/mozilla/nsprpub/pr/src/md/beos/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md/beos diff --git a/mozilla/nsprpub/pr/src/md/beos/CVS/Root b/mozilla/nsprpub/pr/src/md/beos/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/beos/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/beos/CVS/Tag b/mozilla/nsprpub/pr/src/md/beos/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/md/beos/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/mac/CVS/Entries b/mozilla/nsprpub/pr/src/md/mac/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pr/src/md/mac/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pr/src/md/mac/CVS/Repository b/mozilla/nsprpub/pr/src/md/mac/CVS/Repository deleted file mode 100644 index b8059d6..0000000 --- a/mozilla/nsprpub/pr/src/md/mac/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md/mac diff --git a/mozilla/nsprpub/pr/src/md/mac/CVS/Root b/mozilla/nsprpub/pr/src/md/mac/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/mac/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/mac/CVS/Tag b/mozilla/nsprpub/pr/src/md/mac/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pr/src/md/mac/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/os2/CVS/Entries b/mozilla/nsprpub/pr/src/md/os2/CVS/Entries deleted file mode 100644 index 56280fa..0000000 --- a/mozilla/nsprpub/pr/src/md/os2/CVS/Entries +++ /dev/null @@ -1,17 +0,0 @@ -/.cvsignore/1.2/Sat May 12 06:11:46 2001//TNSPR_4_8_RTM -/Makefile.in/1.18/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/objs.mk/1.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2_errors.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2cv.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2emx.s/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2gc.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2inrval.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2io.c/3.20/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2misc.c/3.28/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2poll.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2rng.c/1.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2sem.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2sock.c/3.20/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2thred.c/3.22/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os2vaclegacy.s/3.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/md/os2/CVS/Repository b/mozilla/nsprpub/pr/src/md/os2/CVS/Repository deleted file mode 100644 index d12568b..0000000 --- a/mozilla/nsprpub/pr/src/md/os2/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md/os2 diff --git a/mozilla/nsprpub/pr/src/md/os2/CVS/Root b/mozilla/nsprpub/pr/src/md/os2/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/os2/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/os2/CVS/Tag b/mozilla/nsprpub/pr/src/md/os2/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/md/os2/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/unix/CVS/Entries b/mozilla/nsprpub/pr/src/md/unix/CVS/Entries deleted file mode 100644 index c8b61d9..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/CVS/Entries +++ /dev/null @@ -1,55 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:29:27 2001//TNSPR_4_8_RTM -/Makefile.in/1.28/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/aix.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/aixwrap.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bsdi.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/darwin.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dgux.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/freebsd.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/hpux.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/irix.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/linux.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ncr.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nec.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/netbsd.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nextstep.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nto.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/objs.mk/3.35/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/openbsd.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_AIX.s/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_BSD_386_2.s/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Darwin.s/1.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Darwin_ppc.s/3.4/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Darwin_x86.s/1.4/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Darwin_x86_64.s/1.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_HPUX.s/1.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_HPUX_ia64.s/1.4/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Irix.s/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Linux_ia64.s/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Linux_ppc.s/1.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Linux_x86.s/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_Linux_x86_64.s/1.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_ReliantUNIX.s/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_SunOS_sparcv9.s/3.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_SunOS_ultrasparc.s/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_SunOS_x86.s/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/os_SunOS_x86_64.s/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/osf1.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pthreads_user.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/qnx.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/reliantunix.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/riscos.c/3.2/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/scoos.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/solaris.c/3.18/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sony.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sunos4.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/symbian.c/1.2/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/unix.c/3.60/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/unix_errors.c/3.30/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/unixware.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/uxpoll.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/uxproces.c/3.27/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/uxrng.c/1.26/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/uxshm.c/3.14/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/uxwrap.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/md/unix/CVS/Repository b/mozilla/nsprpub/pr/src/md/unix/CVS/Repository deleted file mode 100644 index 800689b..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md/unix diff --git a/mozilla/nsprpub/pr/src/md/unix/CVS/Root b/mozilla/nsprpub/pr/src/md/unix/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/unix/CVS/Tag b/mozilla/nsprpub/pr/src/md/unix/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/md/unix/ncr.c b/mozilla/nsprpub/pr/src/md/unix/ncr.c deleted file mode 100644 index 2710fc3..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/ncr.c +++ /dev/null @@ -1,363 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * NCR 3.0 - cloned from UnixWare by ruslan - */ -#include "primpl.h" - -#include - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ - if (isCurrent) { - (void) setjmp(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -} - -#ifdef ALARMS_BREAK_TCP /* I don't think they do */ - -PRInt32 _MD_connect(PRInt32 osfd, const PRNetAddr *addr, PRInt32 addrlen, - PRIntervalTime timeout) -{ - PRInt32 rv; - - _MD_BLOCK_CLOCK_INTERRUPTS(); - rv = _connect(osfd,addr,addrlen); - _MD_UNBLOCK_CLOCK_INTERRUPTS(); -} - -PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen, - PRIntervalTime timeout) -{ - PRInt32 rv; - - _MD_BLOCK_CLOCK_INTERRUPTS(); - rv = _accept(osfd,addr,addrlen); - _MD_UNBLOCK_CLOCK_INTERRUPTS(); - return(rv); -} -#endif - -/* - * These are also implemented in pratom.c using NSPR locks. Any reason - * this might be better or worse? If you like this better, define - * _PR_HAVE_ATOMIC_OPS in include/md/unixware.h - */ -#ifdef _PR_HAVE_ATOMIC_OPS -/* Atomic operations */ -#include -static FILE *_uw_semf; - -void -_MD_INIT_ATOMIC(void) -{ - /* Sigh. Sure wish SYSV semaphores weren't such a pain to use */ - if ((_uw_semf = tmpfile()) == NULL) - PR_ASSERT(0); - - return; -} - -void -_MD_ATOMIC_INCREMENT(PRInt32 *val) -{ - flockfile(_uw_semf); - (*val)++; - unflockfile(_uw_semf); -} - -void -_MD_ATOMIC_ADD(PRInt32 *ptr, PRInt32 val) -{ - flockfile(_uw_semf); - (*ptr) += val; - unflockfile(_uw_semf); -} - - -void -_MD_ATOMIC_DECREMENT(PRInt32 *val) -{ - flockfile(_uw_semf); - (*val)--; - unflockfile(_uw_semf); -} - -void -_MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval) -{ - flockfile(_uw_semf); - *val = newval; - unflockfile(_uw_semf); -} -#endif - -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 Unixware */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for Unixware."); -} - -PRStatus -_MD_CREATE_THREAD( - PRThread *thread, - void (*start) (void *), - PRUintn priority, - PRThreadScope scope, - PRThreadState state, - PRUint32 stackSize) -{ - PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for Unixware."); - return PR_FAILURE; -} - -/* - This is temp. replacement for localtime_r. Normally PR_ExplodeTime should - be used as to my understanding -*/ - -/* -** $$$$$ THEN WHY ARE WE DOING THIS? - AOF $$$$$ -*/ - -#define NEED_LOCALTIME_R -#define NEED_GMTIME_R -#define NEED_ASCTIME_R -#define NEED_STRTOK_R -#define NEED_CTIME_R - -#if defined (NEED_LOCALTIME_R) || defined (NEED_CTIME_R) || defined (NEED_ASCTIME_R) || defined (NEED_GMTIME_R) || defined (NEED_STRTOK_R) -#include "prlock.h" -#endif - -#if defined (NEED_LOCALTIME_R) - -static PRLock *localtime_r_monitor = NULL; - -struct tm *localtime_r (const time_t *clock, struct tm *result) -{ - struct tm *tmPtr; - int needLock = PR_Initialized(); /* We need to use a lock to protect - * against NSPR threads only when the - * NSPR thread system is activated. */ - - if (needLock) { - if (localtime_r_monitor == NULL) { - - localtime_r_monitor = PR_NewLock(); - } - PR_Lock(localtime_r_monitor); - } - - /* - * On Windows, localtime() returns a NULL pointer if 'clock' - * represents a time before midnight January 1, 1970. In - * that case, we also return a NULL pointer and the struct tm - * object pointed to by 'result' is not modified. - */ - - tmPtr = localtime(clock); - if (tmPtr) { - *result = *tmPtr; - } else { - result = NULL; - } - - if (needLock) PR_Unlock(localtime_r_monitor); - - return result; -} - -#endif - -#if defined (NEED_GMTIME_R) - -static PRLock *gmtime_r_monitor = NULL; - -struct tm *gmtime_r (const time_t *clock, struct tm *result) -{ - struct tm *tmPtr; - int needLock = PR_Initialized(); /* We need to use a lock to protect - * against NSPR threads only when the - * NSPR thread system is activated. */ - - if (needLock) { - if (gmtime_r_monitor == NULL) { - gmtime_r_monitor = PR_NewLock(); - } - PR_Lock(gmtime_r_monitor); - } - - tmPtr = gmtime(clock); - if (tmPtr) { - *result = *tmPtr; - } else { - result = NULL; - } - - if (needLock) PR_Unlock(gmtime_r_monitor); - - return result; -} - -#endif - -#if defined (NEED_CTIME_R) - -static PRLock *ctime_r_monitor = NULL; - -char *ctime_r (const time_t *clock, char *buf, int buflen) -{ - char *cbuf; - int needLock = PR_Initialized(); /* We need to use a lock to protect - * against NSPR threads only when the - * NSPR thread system is activated. */ - - if (needLock) { - - if (ctime_r_monitor == NULL) { - ctime_r_monitor = PR_NewLock(); - } - PR_Lock(ctime_r_monitor); - } - - cbuf = ctime (clock); - if (cbuf) { - strncpy (buf, cbuf, buflen - 1); - buf[buflen - 1] = 0; - } - - if (needLock) PR_Unlock(ctime_r_monitor); - - return cbuf; -} - -#endif - -#if defined (NEED_ASCTIME_R) - -static PRLock *asctime_r_monitor = NULL; - - -char *asctime_r (const struct tm *tm, char *buf, int buflen) -{ - char *cbuf; - int needLock = PR_Initialized(); /* We need to use a lock to protect - * against NSPR threads only when the - * NSPR thread system is activated. */ - - if (needLock) { - if (asctime_r_monitor == NULL) { - asctime_r_monitor = PR_NewLock(); - } - PR_Lock(asctime_r_monitor); - } - - cbuf = asctime (tm); - if (cbuf) { - strncpy (buf, cbuf, buflen - 1); - buf[buflen - 1] = 0; - } - - if (needLock) PR_Unlock(asctime_r_monitor); - - return cbuf; - -} -#endif - -#if defined (NEED_STRTOK_R) - -char * -strtok_r (s, delim, last) - register char *s; - register const char *delim; - register char **last; -{ - register char *spanp; - register int c, sc; - char *tok; - - - if (s == NULL && (s = *last) == NULL) - return (NULL); - - /* - * Skip (span) leading delimiters (s += strspn(s, delim), sort of). - */ -cont: - - c = *s++; - for (spanp = (char *)delim; (sc = *spanp++) != 0;) { - if (c == sc) - goto cont; - } - - if (c == 0) { /* no non-delimiter characters */ - *last = NULL; - return (NULL); - } - tok = s - 1; - - /* - * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). - * Note that delim must have one NUL; we stop if we see that, too. - */ - for (;;) { - c = *s++; - spanp = (char *)delim; - do { - if ((sc = *spanp++) == c) { - if (c == 0) - s = NULL; - - else - s[-1] = 0; - *last = s; - return (tok); - } - } while (sc != 0); - } - /* NOTREACHED */ -} - -#endif diff --git a/mozilla/nsprpub/pr/src/md/unix/nec.c b/mozilla/nsprpub/pr/src/md/unix/nec.c deleted file mode 100644 index 0792ec3..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/nec.c +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "primpl.h" - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ - if (isCurrent) { - (void) setjmp(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -} - -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 NEC */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for NEC."); -} - -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 NEC."); - return PR_FAILURE; -} diff --git a/mozilla/nsprpub/pr/src/md/unix/nextstep.c b/mozilla/nsprpub/pr/src/md/unix/nextstep.c deleted file mode 100644 index 338ed07..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/nextstep.c +++ /dev/null @@ -1,252 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "primpl.h" - -#import -#import -#import -#include -#include -#include -#include -#include - - - -/* These functions are hidden in NEXTSTEP, but beacuse they have syscall() -** entries I can wrap these into their corresponding missing function. -*/ -caddr_t -mmap(caddr_t addr, size_t len, int prot, int flags, - int fildes, off_t off) -{ - return (caddr_t) syscall (SYS_mmap, addr, len, prot, flags, fildes, off); -} - -int -munmap(caddr_t addr, size_t len) -{ - return syscall (SYS_munmap, addr, len); -} - -int -mprotect(caddr_t addr, size_t len, int prot) -{ - return syscall (SYS_mprotect, addr, len, prot); -} - - -/* If found the brk() symbol in the sahred libraries but no syscall() entry ... -** I don't know whether it will work ... -int brk(void *endds) -{ - return syscall (); -} -*/ - -void *sbrk(int incr) -{ - return (void *) syscall (SYS_sbrk, incr); -} - -/* These are my mach based versions, untested and probably bad ... -*/ -caddr_t my_mmap(caddr_t addr, size_t len, int prot, int flags, - int fildes, off_t off) -{ - kern_return_t ret_val; - - /* First map ... - */ - ret_val = map_fd ( fildes, /* fd */ - (vm_offset_t) off, /* offset */ - (vm_offset_t*)&addr, /* address */ - TRUE, /* find_space */ - (vm_size_t) len); /* size */ - - if (ret_val != KERN_SUCCESS) { - mach_error("Error calling map_fd() in mmap", ret_val ); - return (caddr_t)0; - } - - /* ... then protect (this is probably bad) - */ - ret_val = vm_protect( task_self(), /* target_task */ - (vm_address_t)addr, /* address */ - (vm_size_t) len, /* size */ - FALSE, /* set_maximum */ - (vm_prot_t) prot); /* new_protection */ - if (ret_val != KERN_SUCCESS) { - mach_error("vm_protect in mmap()", ret_val ); - return (caddr_t)0; - } - - return addr; -} - -int my_munmap(caddr_t addr, size_t len) -{ - kern_return_t ret_val; - - ret_val = vm_deallocate(task_self(), - (vm_address_t) addr, - (vm_size_t) len); - - if (ret_val != KERN_SUCCESS) { - mach_error("vm_deallocate in munmap()", ret_val); - return -1; - } - - return 0; -} - -int my_mprotect(caddr_t addr, size_t len, int prot) -{ - vm_prot_t mach_prot; - kern_return_t ret_val; - - switch (prot) { - case PROT_READ: mach_prot = VM_PROT_READ; break; - case PROT_WRITE: mach_prot = VM_PROT_WRITE; break; - case PROT_EXEC: mach_prot = VM_PROT_EXECUTE; break; - case PROT_NONE: mach_prot = VM_PROT_NONE; break; - } - - ret_val = vm_protect(task_self(), /* target_task */ - (vm_address_t)addr, /* address */ - (vm_size_t) len, /* size */ - FALSE, /* set_maximum */ - (vm_prot_t) prot); /* new_protection */ - - if (ret_val != KERN_SUCCESS) { - mach_error("vm_protect in mprotect()", ret_val); - return -1; - } - - return 0; -} - -char *strdup(const char *s1) -{ - int len = strlen (s1); - char *copy = (char*) malloc (len+1); - - if (copy == (char*)0) - return (char*)0; - - strcpy (copy, s1); - - return copy; -} - -/* Stub rld functions -*/ -extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile( - const char *pathName, - NSObjectFileImage *objectFileImage) -{ - return NSObjectFileImageFailure; -} - -extern void * NSAddressOfSymbol( - NSSymbol symbol) -{ - return NULL; -} - -extern NSModule NSLinkModule( - NSObjectFileImage objectFileImage, - const char *moduleName, /* can be NULL */ - enum bool bindNow) -{ - return NULL; -} - -extern NSSymbol NSLookupAndBindSymbol( - const char *symbolName) -{ - return NULL; -} - -extern enum bool NSUnLinkModule( - NSModule module, - enum bool keepMemoryMapped) -{ - return 0; -} - - - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ -#ifndef _PR_PTHREADS - if (isCurrent) { - (void) sigsetjmp(CONTEXT(t), 1); - } - *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 NEXTSTEP */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for NEXTSTEP."); -} - -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 NEXTSTEP."); - return PR_FAILURE; -} - -#endif diff --git a/mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s b/mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s deleted file mode 100644 index f17d02f..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/os_ReliantUNIX.s +++ /dev/null @@ -1,96 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* We want position independent code */ -#define PIC - -#include -#include -#include - - .file 1 "os_ReliantUNIX.s" - .option pic2 - .text - - .align 2 - .globl getcxt - .ent getcxt -getcxt: - .frame sp,0,$31 # vars= 0, regs= 0/0, args= 0, extra= 0 - # saved integer regs - sw ra,180(a0) # gpregs[CXT_EPC] - sw gp,152(a0) # gpregs[CXT_GP] - sw sp,156(a0) # gpregs[CXT_SP] - sw s8,160(a0) # gpregs[CXT_S8] - sw s0,104(a0) # gpregs[CXT_S0] - sw s1,108(a0) # gpregs[CXT_S1] - sw s2,112(a0) # gpregs[CXT_S2] - sw s3,116(a0) # gpregs[CXT_S3] - sw s4,120(a0) # gpregs[CXT_S4] - sw s5,124(a0) # gpregs[CXT_S5] - sw s6,128(a0) # gpregs[CXT_S6] - sw s7,132(a0) # gpregs[CXT_S7] - # csr - cfc1 v0,$31 - # saved float regs - s.d $f20,264(a0) # fpregs.fp_r.fp_dregs[10] - s.d $f22,272(a0) # fpregs.fp_r.fp_dregs[11] - s.d $f24,280(a0) # fpregs.fp_r.fp_dregs[12] - s.d $f26,288(a0) # fpregs.fp_r.fp_dregs[13] - s.d $f28,296(a0) # fpregs.fp_r.fp_dregs[14] - s.d $f30,304(a0) # fpregs.fp_r.fp_dregs[15] - sw v0,312(a0) # fpregs.fp_csr - - # give no illusions about the contents - li v0,0x0c # UC_CPU | UC_MAU - sw v0,0(a0) # uc_flags - - move v0,zero - j ra - .end getcxt - - .align 2 - .globl setcxt - .ent setcxt -setcxt: - .frame sp,0,$31 # vars= 0, regs= 0/0, args= 0, extra= 0 - lw v0,312(a0) # fpregs.fp_csr - li v1,0xfffc0fff # mask out exception cause bits - and v0,v0,v1 - # saved integer regs - lw t9,180(a0) # gpregs[CXT_EPC] - lw ra,180(a0) # gpregs[CXT_EPC] - lw gp,152(a0) # gpregs[CXT_GP] - lw sp,156(a0) # gpregs[CXT_SP] - ctc1 v0,$31 # fp_csr - lw s8,160(a0) # gpregs[CXT_S8] - lw s0,104(a0) # gpregs[CXT_S0] - lw s1,108(a0) # gpregs[CXT_S1] - lw s2,112(a0) # gpregs[CXT_S2] - lw s3,116(a0) # gpregs[CXT_S3] - lw s4,120(a0) # gpregs[CXT_S4] - lw s5,124(a0) # gpregs[CXT_S5] - lw s6,128(a0) # gpregs[CXT_S6] - lw s7,132(a0) # gpregs[CXT_S7] - # saved float regs - l.d $f20,264(a0) # fpregs.fp_r.fp_dregs[10] - l.d $f22,272(a0) # fpregs.fp_r.fp_dregs[11] - l.d $f24,280(a0) # fpregs.fp_r.fp_dregs[12] - l.d $f26,288(a0) # fpregs.fp_r.fp_dregs[13] - l.d $f28,296(a0) # fpregs.fp_r.fp_dregs[14] - l.d $f30,304(a0) # fpregs.fp_r.fp_dregs[15] - - # load these, too - # they were not saved, but maybe the user modified them... - lw v0,48(a0) - lw v1,52(a0) - lw a1,60(a0) - lw a2,64(a0) - lw a3,68(a0) - lw a0,56(a0) # there is no way back - - j ra - - .end setcxt diff --git a/mozilla/nsprpub/pr/src/md/unix/reliantunix.c b/mozilla/nsprpub/pr/src/md/unix/reliantunix.c deleted file mode 100644 index 90fa2eb..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/reliantunix.c +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * SINIX (ReliantUNIX) 5.4 - copied from unixware.c by chrisk 040497 - */ -#include "primpl.h" - -#include - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ - if (isCurrent) { - (void) _GETCONTEXT(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -} - -#ifdef ALARMS_BREAK_TCP /* I don't think they do */ - -PRInt32 _MD_connect(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen, - PRIntervalTime timeout) -{ - PRInt32 rv; - - _MD_BLOCK_CLOCK_INTERRUPTS(); - rv = _connect(osfd,addr,addrlen); - _MD_UNBLOCK_CLOCK_INTERRUPTS(); -} - -PRInt32 _MD_accept(PRInt32 osfd, PRNetAddr *addr, PRInt32 addrlen, - PRIntervalTime timeout) -{ - PRInt32 rv; - - _MD_BLOCK_CLOCK_INTERRUPTS(); - rv = _accept(osfd,addr,addrlen); - _MD_UNBLOCK_CLOCK_INTERRUPTS(); - return(rv); -} -#endif - -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 SINIX */ -/* Why? Just copied it from UNIXWARE... flying-by-night, chrisk 040497 */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for SINIX."); -} - -PRStatus -_MD_CREATE_THREAD( - PRThread *thread, - void (*start) (void *), - PRUintn priority, - PRThreadScope scope, - PRThreadState state, - PRUint32 stackSize) -{ - PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for SINIX."); -#if defined(SNI) && !defined(__GNUC__) - /* make compiler happy */ - return (PRStatus)NULL; -#endif -} diff --git a/mozilla/nsprpub/pr/src/md/unix/sony.c b/mozilla/nsprpub/pr/src/md/unix/sony.c deleted file mode 100644 index 033d089..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/sony.c +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "primpl.h" - -#include - -void _MD_EarlyInit(void) -{ -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ -#ifndef _PR_PTHREADS - if (isCurrent) { - (void) setjmp(CONTEXT(t), 1); - } - *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 Sony */ -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for SONY."); -} - -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 SONY."); - return PR_FAILURE; -} -#endif /* ! _PR_PTHREADS */ diff --git a/mozilla/nsprpub/pr/src/md/unix/sunos4.c b/mozilla/nsprpub/pr/src/md/unix/sunos4.c deleted file mode 100644 index 4b8843a..0000000 --- a/mozilla/nsprpub/pr/src/md/unix/sunos4.c +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include -#include "primpl.h" - -void _MD_EarlyInit(void) -{ -} - -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 SunOS 4.1.3."); - return PR_FAILURE; -} - -void _MD_SET_PRIORITY(_MDThread *md_thread, PRUintn newPri) -{ - PR_NOT_REACHED("_MD_SET_PRIORITY should not be called for user-level threads."); -} - -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; -} - -PRStatus _MD_InitializeThread(PRThread *thread) -{ - return PR_SUCCESS; -} - -void -_MD_YIELD(void) -{ - PR_NOT_REACHED("_MD_YIELD should not be called for SunOS 4.1.3."); -} - -PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) -{ - if (isCurrent) { - (void) setjmp(CONTEXT(t)); - } - *np = sizeof(CONTEXT(t)) / sizeof(PRWord); - return (PRWord *) CONTEXT(t); -} diff --git a/mozilla/nsprpub/pr/src/md/windows/CVS/Entries b/mozilla/nsprpub/pr/src/md/windows/CVS/Entries deleted file mode 100644 index ed21914..0000000 --- a/mozilla/nsprpub/pr/src/md/windows/CVS/Entries +++ /dev/null @@ -1,22 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:42:04 2001//TNSPR_4_8_RTM -/Makefile.in/1.22/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntdllmn.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntgc.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntinrval.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntio.c/3.49/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntmisc.c/3.31/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntsec.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntsem.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/objs.mk/1.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w32ipcsem.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w32poll.c/3.14/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w32rng.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w32shm.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w95cv.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w95dllmain.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w95io.c/3.43/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/w95sock.c/3.19/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/win32_errors.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntthread.c/3.21/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -/w95thred.c/3.22/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/pr/src/md/windows/CVS/Repository b/mozilla/nsprpub/pr/src/md/windows/CVS/Repository deleted file mode 100644 index 1f47e1f..0000000 --- a/mozilla/nsprpub/pr/src/md/windows/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/md/windows diff --git a/mozilla/nsprpub/pr/src/md/windows/CVS/Root b/mozilla/nsprpub/pr/src/md/windows/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/md/windows/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/md/windows/CVS/Tag b/mozilla/nsprpub/pr/src/md/windows/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/md/windows/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/memory/CVS/Entries b/mozilla/nsprpub/pr/src/memory/CVS/Entries deleted file mode 100644 index 55461f6..0000000 --- a/mozilla/nsprpub/pr/src/memory/CVS/Entries +++ /dev/null @@ -1,6 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:47:04 2001//TNSPR_4_8_RTM -/Makefile.in/1.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prseg.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prshm.c/3.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prshma.c/3.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/memory/CVS/Repository b/mozilla/nsprpub/pr/src/memory/CVS/Repository deleted file mode 100644 index 295b44d..0000000 --- a/mozilla/nsprpub/pr/src/memory/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/memory diff --git a/mozilla/nsprpub/pr/src/memory/CVS/Root b/mozilla/nsprpub/pr/src/memory/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/memory/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/memory/CVS/Tag b/mozilla/nsprpub/pr/src/memory/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/memory/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/misc/CVS/Entries b/mozilla/nsprpub/pr/src/misc/CVS/Entries deleted file mode 100644 index 61258a2..0000000 --- a/mozilla/nsprpub/pr/src/misc/CVS/Entries +++ /dev/null @@ -1,30 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:52:36 2001//TNSPR_4_8_RTM -/praton.c/1.1/Sat Dec 19 09:06:07 2009//TNSPR_4_8_4_RTM -/Makefile.in/1.25/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/compile-et.pl/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dtoa.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pralarm.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pratom.c/3.20/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prcountr.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prdtoa.c/4.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prenv.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prerr.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prerr.et/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prerr.properties/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prerror.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prerrortable.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prinit.c/3.59/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prinrval.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pripc.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pripcsem.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prlog2.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prlong.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prnetdb.c/3.67/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prolock.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prrng.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prsystem.c/3.38/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prthinfo.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prtime.c/3.46/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prtpool.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prtrace.c/3.14/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/src/misc/CVS/Repository b/mozilla/nsprpub/pr/src/misc/CVS/Repository deleted file mode 100644 index fed458c..0000000 --- a/mozilla/nsprpub/pr/src/misc/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/misc diff --git a/mozilla/nsprpub/pr/src/misc/CVS/Root b/mozilla/nsprpub/pr/src/misc/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/misc/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/misc/CVS/Tag b/mozilla/nsprpub/pr/src/misc/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/misc/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/pthreads/CVS/Entries b/mozilla/nsprpub/pr/src/pthreads/CVS/Entries deleted file mode 100644 index c9f0f0b..0000000 --- a/mozilla/nsprpub/pr/src/pthreads/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:53:48 2001//TNSPR_4_8_RTM -/Makefile.in/1.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ptio.c/3.118/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ptmisc.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ptsynch.c/3.37/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ptthread.c/3.96/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/pr/src/pthreads/CVS/Repository b/mozilla/nsprpub/pr/src/pthreads/CVS/Repository deleted file mode 100644 index 78b10f0..0000000 --- a/mozilla/nsprpub/pr/src/pthreads/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/pthreads diff --git a/mozilla/nsprpub/pr/src/pthreads/CVS/Root b/mozilla/nsprpub/pr/src/pthreads/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/pthreads/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/pthreads/CVS/Tag b/mozilla/nsprpub/pr/src/pthreads/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/pthreads/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/threads/CVS/Entries b/mozilla/nsprpub/pr/src/threads/CVS/Entries deleted file mode 100644 index 8e70fb1..0000000 --- a/mozilla/nsprpub/pr/src/threads/CVS/Entries +++ /dev/null @@ -1,10 +0,0 @@ -D/combined//// -/.cvsignore/1.2/Sat May 12 04:55:26 2001//TNSPR_4_8_RTM -/Makefile.in/1.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prcmon.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prdump.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prmon.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prrwlock.c/1.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prsem.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prtpd.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prcthr.c/3.22/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/threads/CVS/Repository b/mozilla/nsprpub/pr/src/threads/CVS/Repository deleted file mode 100644 index 5e6679e..0000000 --- a/mozilla/nsprpub/pr/src/threads/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/threads diff --git a/mozilla/nsprpub/pr/src/threads/CVS/Root b/mozilla/nsprpub/pr/src/threads/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/threads/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/threads/CVS/Tag b/mozilla/nsprpub/pr/src/threads/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/threads/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/src/threads/combined/CVS/Entries b/mozilla/nsprpub/pr/src/threads/combined/CVS/Entries deleted file mode 100644 index 66529bc..0000000 --- a/mozilla/nsprpub/pr/src/threads/combined/CVS/Entries +++ /dev/null @@ -1,9 +0,0 @@ -/.cvsignore/1.2/Sat May 12 04:56:56 2001//TNSPR_4_8_RTM -/README/3.1/Sat Mar 28 03:37:59 1998//TNSPR_4_8_RTM -/Makefile.in/1.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prucpu.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prucv.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prulock.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prustack.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pruthr.c/3.45/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM -D diff --git a/mozilla/nsprpub/pr/src/threads/combined/CVS/Repository b/mozilla/nsprpub/pr/src/threads/combined/CVS/Repository deleted file mode 100644 index 33828e0..0000000 --- a/mozilla/nsprpub/pr/src/threads/combined/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/src/threads/combined diff --git a/mozilla/nsprpub/pr/src/threads/combined/CVS/Root b/mozilla/nsprpub/pr/src/threads/combined/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/src/threads/combined/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/src/threads/combined/CVS/Tag b/mozilla/nsprpub/pr/src/threads/combined/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/src/threads/combined/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/tests/CVS/Entries b/mozilla/nsprpub/pr/tests/CVS/Entries deleted file mode 100644 index 7b0c557..0000000 --- a/mozilla/nsprpub/pr/tests/CVS/Entries +++ /dev/null @@ -1,177 +0,0 @@ -D/dll//// -D/w16gui//// -D/macbuild//// -/.cvsignore/1.2/Sat May 12 05:06:18 2001//TNSPR_4_8_RTM -/README.TXT/3.3/Mon Oct 27 12:13:26 2008//TNSPR_4_8_RTM -/Makefile.in/1.69/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/accept.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/acceptread.c/1.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/acceptreademu.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/addrstr.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/affinity.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/alarm.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/anonfm.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/append.c/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/atomic.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/attach.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bigfile.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bigfile2.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bigfile3.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/bug1test.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/cleanup.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/cltsrv.c/3.19/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/concur.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/cvar.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/cvar2.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dbmalloc.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dbmalloc1.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dceemu.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/depend.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dlltest.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/dtoa.c/1.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/env.c/1.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/errcodes.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/errset.c/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/exit.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/fdcach.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/fileio.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/foreign.c/3.18/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/forktest.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/formattm.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/freeif.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/fsync.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/getai.c/1.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/gethost.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/getproto.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/i2l.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/initclk.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/inrval.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/instrumt.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/intrio.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/intrupt.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/io_timeout.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/io_timeoutk.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/io_timeoutu.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ioconthr.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ipv6.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/join.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/joinkk.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/joinku.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/joinuk.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/joinuu.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/layer.c/3.14/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/lazyinit.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/libfilename.c/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/lltest.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/lock.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/lockfile.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/logfile.c/1.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/logger.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/makedir.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/many_cv.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/mbcs.c/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/multiacc.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/multiwait.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nameshm1.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nbconn.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nblayer.c/1.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/nonblock.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntioto.c/1.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ntoh.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/obsints.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_2long.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_excl.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_filnf.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_filok.c/3.18/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_noacc.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/op_nofil.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/openfile.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/parent.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/parsetm.c/1.3/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/peek.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/perf.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pipeping.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pipeping2.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pipepong.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pipepong2.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pipeself.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/poll_er.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/poll_nm.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/poll_to.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/pollable.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prftest.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prftest1.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prftest2.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/primblok.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/priotest.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/provider.c/3.20/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prpoll.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prpollml.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prselect.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/prttools.h/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/randseed.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ranfile.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/reinit.c/1.2/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/rmdir.c/1.5/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/runtests.pl/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/runtests.sh/1.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/runy2ktests.ksh/3.7/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/rwlocktest.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sel_spd.c/3.19/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/selct_er.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/selct_nm.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/selct_to.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/select2.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/selintr.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sem.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sema.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/semaerr.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/semaerr1.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/semaping.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/semapong.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sendzlf.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/server_test.c/3.14/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/servr_kk.c/3.16/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/servr_ku.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/servr_uk.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/servr_uu.c/3.15/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/short_thread.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sigpipe.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sleep.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/socket.c/3.24/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sockopt.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sockping.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sockpong.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sprintf.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sproc_ch.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/sproc_p.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/stack.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/stat.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/stdio.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/str2addr.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/strod.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/suspend.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/switch.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/system.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/testbit.c/1.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/testfile.c/3.22/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/threads.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/thrpool_client.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/thrpool_server.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/thruput.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/time.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/timemac.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/timetest.c/3.13/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/tmoacc.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/tmocon.c/3.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/tpd.c/3.12/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/udpsrv.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/ut_ttools.h/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/version.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/writev.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/xnotify.c/3.8/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/y2k.c/3.11/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/y2ktmo.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/yield.c/3.10/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/zerolen.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/vercheck.c/1.40/Tue Jul 24 08:48:28 2012//TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/tests/CVS/Repository b/mozilla/nsprpub/pr/tests/CVS/Repository deleted file mode 100644 index 5cec2e9..0000000 --- a/mozilla/nsprpub/pr/tests/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/tests diff --git a/mozilla/nsprpub/pr/tests/CVS/Root b/mozilla/nsprpub/pr/tests/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/tests/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/tests/CVS/Tag b/mozilla/nsprpub/pr/tests/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/tests/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/tests/dll/CVS/Entries b/mozilla/nsprpub/pr/tests/dll/CVS/Entries deleted file mode 100644 index 8bc8380..0000000 --- a/mozilla/nsprpub/pr/tests/dll/CVS/Entries +++ /dev/null @@ -1,6 +0,0 @@ -/.cvsignore/1.2/Sat May 12 05:07:36 2001//TNSPR_4_8_RTM -/Makefile.in/1.19/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/my.def/1.4/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/mygetval.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/mysetval.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/pr/tests/dll/CVS/Repository b/mozilla/nsprpub/pr/tests/dll/CVS/Repository deleted file mode 100644 index a7f251c..0000000 --- a/mozilla/nsprpub/pr/tests/dll/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/tests/dll diff --git a/mozilla/nsprpub/pr/tests/dll/CVS/Root b/mozilla/nsprpub/pr/tests/dll/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/tests/dll/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/tests/dll/CVS/Tag b/mozilla/nsprpub/pr/tests/dll/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/pr/tests/dll/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/tests/macbuild/CVS/Entries b/mozilla/nsprpub/pr/tests/macbuild/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pr/tests/macbuild/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pr/tests/macbuild/CVS/Repository b/mozilla/nsprpub/pr/tests/macbuild/CVS/Repository deleted file mode 100644 index 0aa3156..0000000 --- a/mozilla/nsprpub/pr/tests/macbuild/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/tests/macbuild diff --git a/mozilla/nsprpub/pr/tests/macbuild/CVS/Root b/mozilla/nsprpub/pr/tests/macbuild/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/tests/macbuild/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/tests/macbuild/CVS/Tag b/mozilla/nsprpub/pr/tests/macbuild/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pr/tests/macbuild/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/pr/tests/w16gui/CVS/Entries b/mozilla/nsprpub/pr/tests/w16gui/CVS/Entries deleted file mode 100644 index 1784810..0000000 --- a/mozilla/nsprpub/pr/tests/w16gui/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/mozilla/nsprpub/pr/tests/w16gui/CVS/Repository b/mozilla/nsprpub/pr/tests/w16gui/CVS/Repository deleted file mode 100644 index 5ddd29e..0000000 --- a/mozilla/nsprpub/pr/tests/w16gui/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/pr/tests/w16gui diff --git a/mozilla/nsprpub/pr/tests/w16gui/CVS/Root b/mozilla/nsprpub/pr/tests/w16gui/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/pr/tests/w16gui/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/pr/tests/w16gui/CVS/Tag b/mozilla/nsprpub/pr/tests/w16gui/CVS/Tag deleted file mode 100644 index 8391a39..0000000 --- a/mozilla/nsprpub/pr/tests/w16gui/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -TNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/tools/CVS/Entries b/mozilla/nsprpub/tools/CVS/Entries deleted file mode 100644 index 8fbdf32..0000000 --- a/mozilla/nsprpub/tools/CVS/Entries +++ /dev/null @@ -1,5 +0,0 @@ -/.cvsignore/1.2/Sat May 12 05:12:57 2001//TNSPR_4_8_RTM -/Makefile.in/1.17/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/httpget.c/3.9/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -/tail.c/3.6/Fri Jun 1 14:48:45 2012//TNSPR_4_9_1_RTM -D diff --git a/mozilla/nsprpub/tools/CVS/Repository b/mozilla/nsprpub/tools/CVS/Repository deleted file mode 100644 index 690fd77..0000000 --- a/mozilla/nsprpub/tools/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -mozilla/nsprpub/tools diff --git a/mozilla/nsprpub/tools/CVS/Root b/mozilla/nsprpub/tools/CVS/Root deleted file mode 100644 index cdb6f4a..0000000 --- a/mozilla/nsprpub/tools/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot diff --git a/mozilla/nsprpub/tools/CVS/Tag b/mozilla/nsprpub/tools/CVS/Tag deleted file mode 100644 index ee04b28..0000000 --- a/mozilla/nsprpub/tools/CVS/Tag +++ /dev/null @@ -1 +0,0 @@ -NNSPR_4_9_2_RTM diff --git a/mozilla/nsprpub/.cvsignore b/nspr/.cvsignore similarity index 100% rename from mozilla/nsprpub/.cvsignore rename to nspr/.cvsignore diff --git a/nspr/.hg_archival.txt b/nspr/.hg_archival.txt new file mode 100644 index 0000000..efd6457 --- /dev/null +++ b/nspr/.hg_archival.txt @@ -0,0 +1,5 @@ +repo: a4b34919bf34db2ee22acbbc305693c8980b6dc6 +node: a79384724f5c56f0ed99ab18fe705c757aee2c8f +branch: default +latesttag: NSPR_4_10_RTM +latesttagdistance: 1 diff --git a/nspr/.hgignore b/nspr/.hgignore new file mode 100644 index 0000000..17751f8 --- /dev/null +++ b/nspr/.hgignore @@ -0,0 +1,5 @@ +syntax: glob +*~ +*OPT.OBJ/* +*DBG.OBJ/* +*DBG.OBJD/* diff --git a/mozilla/nsprpub/LICENSE b/nspr/LICENSE similarity index 100% rename from mozilla/nsprpub/LICENSE rename to nspr/LICENSE diff --git a/mozilla/nsprpub/Makefile.in b/nspr/Makefile.in similarity index 100% rename from mozilla/nsprpub/Makefile.in rename to nspr/Makefile.in diff --git a/mozilla/nsprpub/aclocal.m4 b/nspr/aclocal.m4 similarity index 100% rename from mozilla/nsprpub/aclocal.m4 rename to nspr/aclocal.m4 diff --git a/mozilla/nsprpub/admin/explode.pl b/nspr/admin/explode.pl similarity index 100% rename from mozilla/nsprpub/admin/explode.pl rename to nspr/admin/explode.pl diff --git a/mozilla/nsprpub/admin/makeTargetDirs.sh b/nspr/admin/makeTargetDirs.sh similarity index 100% rename from mozilla/nsprpub/admin/makeTargetDirs.sh rename to nspr/admin/makeTargetDirs.sh diff --git a/mozilla/nsprpub/admin/symlinks.sh b/nspr/admin/symlinks.sh similarity index 100% rename from mozilla/nsprpub/admin/symlinks.sh rename to nspr/admin/symlinks.sh diff --git a/mozilla/nsprpub/build/autoconf/acwinpaths.m4 b/nspr/build/autoconf/acwinpaths.m4 similarity index 100% rename from mozilla/nsprpub/build/autoconf/acwinpaths.m4 rename to nspr/build/autoconf/acwinpaths.m4 diff --git a/mozilla/nsprpub/build/autoconf/config.guess b/nspr/build/autoconf/config.guess similarity index 100% rename from mozilla/nsprpub/build/autoconf/config.guess rename to nspr/build/autoconf/config.guess diff --git a/mozilla/nsprpub/build/autoconf/config.sub b/nspr/build/autoconf/config.sub similarity index 100% rename from mozilla/nsprpub/build/autoconf/config.sub rename to nspr/build/autoconf/config.sub diff --git a/mozilla/nsprpub/build/autoconf/install-sh b/nspr/build/autoconf/install-sh similarity index 100% rename from mozilla/nsprpub/build/autoconf/install-sh rename to nspr/build/autoconf/install-sh diff --git a/mozilla/nsprpub/build/cygwin-wrapper b/nspr/build/cygwin-wrapper similarity index 100% rename from mozilla/nsprpub/build/cygwin-wrapper rename to nspr/build/cygwin-wrapper diff --git a/mozilla/nsprpub/build/win32/pgomerge.py b/nspr/build/win32/pgomerge.py similarity index 100% rename from mozilla/nsprpub/build/win32/pgomerge.py rename to nspr/build/win32/pgomerge.py diff --git a/mozilla/nsprpub/config/.cvsignore b/nspr/config/.cvsignore similarity index 100% rename from mozilla/nsprpub/config/.cvsignore rename to nspr/config/.cvsignore diff --git a/mozilla/nsprpub/config/Makefile.in b/nspr/config/Makefile.in similarity index 97% rename from mozilla/nsprpub/config/Makefile.in rename to nspr/config/Makefile.in index 8557f3e..7062c5c 100644 --- a/mozilla/nsprpub/config/Makefile.in +++ b/nspr/config/Makefile.in @@ -44,7 +44,7 @@ endif # Temporary workaround to disable the generation of # library build time because now.c uses the 'long long' # data type that's not available on some platforms. -ifeq (,$(filter-out NEC NEXTSTEP QNX SCOOS UNIXWARE,$(OS_ARCH))) +ifeq (,$(filter-out QNX SCOOS UNIXWARE,$(OS_ARCH))) DEFINES += -DOMIT_LIB_BUILD_TIME endif diff --git a/mozilla/nsprpub/config/autoconf.mk.in b/nspr/config/autoconf.mk.in similarity index 100% rename from mozilla/nsprpub/config/autoconf.mk.in rename to nspr/config/autoconf.mk.in diff --git a/mozilla/nsprpub/config/config.mk b/nspr/config/config.mk similarity index 100% rename from mozilla/nsprpub/config/config.mk rename to nspr/config/config.mk diff --git a/mozilla/nsprpub/config/gcc_hidden.h b/nspr/config/gcc_hidden.h similarity index 100% rename from mozilla/nsprpub/config/gcc_hidden.h rename to nspr/config/gcc_hidden.h diff --git a/mozilla/nsprpub/config/libc_r.h b/nspr/config/libc_r.h similarity index 100% rename from mozilla/nsprpub/config/libc_r.h rename to nspr/config/libc_r.h diff --git a/mozilla/nsprpub/config/make-system-wrappers.pl b/nspr/config/make-system-wrappers.pl similarity index 100% rename from mozilla/nsprpub/config/make-system-wrappers.pl rename to nspr/config/make-system-wrappers.pl diff --git a/mozilla/nsprpub/config/nfspwd.pl b/nspr/config/nfspwd.pl similarity index 100% rename from mozilla/nsprpub/config/nfspwd.pl rename to nspr/config/nfspwd.pl diff --git a/mozilla/nsprpub/config/now.c b/nspr/config/now.c similarity index 100% rename from mozilla/nsprpub/config/now.c rename to nspr/config/now.c diff --git a/mozilla/nsprpub/config/nsinstall.c b/nspr/config/nsinstall.c similarity index 94% rename from mozilla/nsprpub/config/nsinstall.c rename to nspr/config/nsinstall.c index 022c6f3..3396dcb 100644 --- a/mozilla/nsprpub/config/nsinstall.c +++ b/nspr/config/nsinstall.c @@ -38,48 +38,20 @@ * Does getcwd() take NULL as the first argument and malloc * the result buffer? */ -#if !defined(DARWIN) && !defined(NEXTSTEP) +#if !defined(DARWIN) #define GETCWD_CAN_MALLOC #endif -#ifdef NEXTSTEP -#include - -/* -** balazs.pataki@sztaki.hu: The getcwd is broken in NEXTSTEP (returns 0), -** when called on a mounted fs. Did anyone notice this? Here's an ugly -** workaround ... -*/ -#define getcwd(b,s) my_getcwd(b,s) - -static char * -my_getcwd (char *buf, size_t size) -{ - FILE *pwd = popen("pwd", "r"); - char *result = fgets(buf, size, pwd); - - if (result) { - buf[strlen(buf)-1] = '\0'; - } - pclose (pwd); - return buf; -} -#endif /* NEXTSTEP */ - #if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) #include #endif -#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(NEXTSTEP) +#if defined(SCO) || defined(UNIXWARE) #if !defined(S_ISLNK) && defined(S_IFLNK) #define S_ISLNK(a) (((a) & S_IFMT) == S_IFLNK) #endif #endif -#if defined(SNI) -extern int fchmod(int fildes, mode_t mode); -#endif - #ifdef QNX #define d_ino d_stat.st_ino #endif diff --git a/mozilla/nsprpub/config/nspr-config.in b/nspr/config/nspr-config.in similarity index 100% rename from mozilla/nsprpub/config/nspr-config.in rename to nspr/config/nspr-config.in diff --git a/mozilla/nsprpub/config/nspr.m4 b/nspr/config/nspr.m4 similarity index 100% rename from mozilla/nsprpub/config/nspr.m4 rename to nspr/config/nspr.m4 diff --git a/mozilla/nsprpub/config/nspr.pc.in b/nspr/config/nspr.pc.in similarity index 100% rename from mozilla/nsprpub/config/nspr.pc.in rename to nspr/config/nspr.pc.in diff --git a/mozilla/nsprpub/config/nsprincl.mk.in b/nspr/config/nsprincl.mk.in similarity index 100% rename from mozilla/nsprpub/config/nsprincl.mk.in rename to nspr/config/nsprincl.mk.in diff --git a/mozilla/nsprpub/config/nsprincl.sh.in b/nspr/config/nsprincl.sh.in similarity index 100% rename from mozilla/nsprpub/config/nsprincl.sh.in rename to nspr/config/nsprincl.sh.in diff --git a/mozilla/nsprpub/config/pathsub.h b/nspr/config/pathsub.h similarity index 95% rename from mozilla/nsprpub/config/pathsub.h rename to nspr/config/pathsub.h index 136d411..98b6c11 100644 --- a/mozilla/nsprpub/config/pathsub.h +++ b/nspr/config/pathsub.h @@ -13,10 +13,6 @@ #include #include -#if SUNOS4 -#include "../pr/include/md/sunos4.h" -#endif - #ifndef PATH_MAX #define PATH_MAX 1024 #endif diff --git a/mozilla/nsprpub/config/prdepend.h b/nspr/config/prdepend.h similarity index 99% rename from mozilla/nsprpub/config/prdepend.h rename to nspr/config/prdepend.h index e49e926..6c66b37 100644 --- a/mozilla/nsprpub/config/prdepend.h +++ b/nspr/config/prdepend.h @@ -10,3 +10,4 @@ */ #error "Do not include this header file." + diff --git a/mozilla/nsprpub/config/rules.mk b/nspr/config/rules.mk similarity index 100% rename from mozilla/nsprpub/config/rules.mk rename to nspr/config/rules.mk diff --git a/mozilla/nsprpub/config/system-headers b/nspr/config/system-headers similarity index 100% rename from mozilla/nsprpub/config/system-headers rename to nspr/config/system-headers diff --git a/mozilla/nsprpub/configure b/nspr/configure similarity index 94% rename from mozilla/nsprpub/configure rename to nspr/configure index 7493615..369a529 100755 --- a/mozilla/nsprpub/configure +++ b/nspr/configure @@ -19,7 +19,7 @@ ac_help="$ac_help location of the Android toolchain" ac_help="$ac_help --with-android-version=VER - Android platform version, default 5" + Android platform version, default 5 for arm, 9 for x86/mips" ac_help="$ac_help --with-android-platform=DIR location of platform dir" @@ -735,8 +735,8 @@ test "$host_alias" != "$target_alias" && MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=2 +MOD_MINOR_VERSION=10 +MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -857,12 +857,19 @@ if test "${with_android_toolchain+set}" = set; then fi +case "$target_cpu" in +arm) + android_version=5 + ;; +i?86|mipsel) + android_version=9 + ;; +esac + # Check whether --with-android-version or --without-android-version was given. if test "${with_android_version+set}" = set; then withval="$with_android_version" android_version=$withval -else - android_version=5 fi @@ -878,7 +885,7 @@ arm-linux*-android*|*-linuxandroid*) android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -924,7 +931,7 @@ case "$target" in if test -z "$android_toolchain" ; then echo $ac_n "checking for android toolchain directory""... $ac_c" 1>&6 -echo "configure:928: checking for android toolchain directory" >&5 +echo "configure:935: checking for android toolchain directory" >&5 kernel_name=`uname -s | tr "[:upper:]" "[:lower:]"` @@ -950,7 +957,7 @@ echo "configure:928: checking for android toolchain directory" >&5 if test -z "$android_platform" ; then echo $ac_n "checking for android platform directory""... $ac_c" 1>&6 -echo "configure:954: checking for android platform directory" >&5 +echo "configure:961: checking for android platform directory" >&5 case "$target_cpu" in arm) @@ -973,6 +980,14 @@ echo "configure:954: checking for android platform directory" >&5 fi fi + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + android_tool_prefix="i686-android-linux" + fi + ;; + esac + AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++ @@ -1004,10 +1019,6 @@ echo "configure:954: checking for android platform directory" >&5 #define ANDROID 1 EOF - cat >> confdefs.h <&6 -echo "configure:1308: checking for $ac_word" >&5 +echo "configure:1323: 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 @@ -1376,13 +1387,13 @@ if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:1380: checking for $host compiler" >&5 +echo "configure:1395: 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:1386: checking for $ac_word" >&5 +echo "configure:1401: 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 @@ -1428,18 +1439,18 @@ 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:1432: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1447: 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:1456: \"$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 + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -1472,7 +1483,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:1476: checking for $ac_word" >&5 +echo "configure:1491: 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 @@ -1506,7 +1517,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:1510: checking for $ac_word" >&5 +echo "configure:1525: 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 @@ -1536,7 +1547,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:1540: checking for $ac_word" >&5 +echo "configure:1555: 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 @@ -1587,7 +1598,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:1591: checking for $ac_word" >&5 +echo "configure:1606: 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 @@ -1619,7 +1630,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1638: 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. @@ -1630,12 +1641,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1634 "configure" +#line 1649 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1654: \"$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 @@ -1661,12 +1672,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:1665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1680: 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:1670: checking whether we are using GNU C" >&5 +echo "configure:1685: 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 @@ -1675,7 +1686,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1679: \"$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:1694: \"$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 @@ -1694,7 +1705,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:1698: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1713: 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 @@ -1731,7 +1742,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:1735: checking for $ac_word" >&5 +echo "configure:1750: 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 @@ -1767,7 +1778,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:1771: checking for $ac_word" >&5 +echo "configure:1786: 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 @@ -1799,7 +1810,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1818: 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. @@ -1810,12 +1821,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1814 "configure" +#line 1829 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1834: \"$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 @@ -1841,12 +1852,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:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1860: 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:1850: checking whether we are using GNU C++" >&5 +echo "configure:1865: 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 @@ -1855,7 +1866,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$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:1874: \"$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 @@ -1874,7 +1885,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:1878: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1893: 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 @@ -1919,7 +1930,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:1923: checking for $ac_word" >&5 +echo "configure:1938: 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 @@ -1954,7 +1965,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:1958: checking for $ac_word" >&5 +echo "configure:1973: 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 @@ -1989,7 +2000,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:1993: checking for $ac_word" >&5 +echo "configure:2008: 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 @@ -2024,7 +2035,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:2028: checking for $ac_word" >&5 +echo "configure:2043: 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 @@ -2059,7 +2070,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:2063: checking for $ac_word" >&5 +echo "configure:2078: 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 @@ -2094,7 +2105,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:2098: checking for $ac_word" >&5 +echo "configure:2113: 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 @@ -2129,7 +2140,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:2133: checking for $ac_word" >&5 +echo "configure:2148: 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 @@ -2159,7 +2170,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:2163: checking for $ac_word" >&5 +echo "configure:2178: 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 @@ -2210,7 +2221,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:2214: checking for $ac_word" >&5 +echo "configure:2229: 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 @@ -2242,7 +2253,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2261: 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. @@ -2253,12 +2264,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2257 "configure" +#line 2272 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2277: \"$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 @@ -2284,12 +2295,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:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2303: 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:2293: checking whether we are using GNU C" >&5 +echo "configure:2308: 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 @@ -2298,7 +2309,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$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:2317: \"$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 @@ -2317,7 +2328,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:2321: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2336: 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 @@ -2357,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:2361: checking for $ac_word" >&5 +echo "configure:2376: 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 @@ -2389,7 +2400,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2393: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2408: 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. @@ -2400,12 +2411,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2404 "configure" +#line 2419 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2424: \"$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 @@ -2431,12 +2442,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:2435: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2450: 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:2440: checking whether we are using GNU C++" >&5 +echo "configure:2455: 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 @@ -2445,7 +2456,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2449: \"$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:2464: \"$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 @@ -2464,7 +2475,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:2468: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2483: 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 @@ -2498,7 +2509,7 @@ fi fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2502: checking how to run the C preprocessor" >&5 +echo "configure:2517: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2513,13 +2524,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:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2538: \"$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 : @@ -2530,13 +2541,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:2540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2555: \"$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 : @@ -2547,13 +2558,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:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2572: \"$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 : @@ -2580,7 +2591,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:2584: checking for $ac_word" >&5 +echo "configure:2599: 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 @@ -2612,7 +2623,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:2616: checking for $ac_word" >&5 +echo "configure:2631: 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 @@ -2653,7 +2664,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:2657: checking for $ac_word" >&5 +echo "configure:2672: 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 @@ -2694,7 +2705,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:2698: checking for $ac_word" >&5 +echo "configure:2713: 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 @@ -2735,7 +2746,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:2739: checking for $ac_word" >&5 +echo "configure:2754: 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 @@ -2776,7 +2787,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:2780: checking for $ac_word" >&5 +echo "configure:2795: 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 @@ -2844,7 +2855,7 @@ else fi echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:2848: checking for gcc -pipe support" >&5 +echo "configure:2863: 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 @@ -2859,14 +2870,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:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -2896,16 +2907,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:2900: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:2915: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -2928,7 +2939,7 @@ CFLAGS="$_SAVE_CFLAGS" if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:2932: checking for visibility(hidden) attribute" >&5 +echo "configure:2947: 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 @@ -2952,7 +2963,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:2956: checking for visibility pragma support" >&5 +echo "configure:2971: 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 @@ -3005,7 +3016,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:3009: checking for $ac_word" >&5 +echo "configure:3024: 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 @@ -3327,14 +3338,14 @@ no) _SAVE_CFLAGS="$CFLAGS" CFLAGS="$arch_flag" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* MOZ_THUMB2=1 else @@ -3396,16 +3407,16 @@ if test -n "$all_flags"; then _SAVE_CFLAGS="$CFLAGS" CFLAGS="$all_flags" echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 -echo "configure:3400: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 +echo "configure:3415: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3462,17 +3473,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:3466: checking for sys/atomic_op.h" >&5 +echo "configure:3481: 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:3476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3491: \"$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* @@ -3629,7 +3640,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:3633: checking for gethostbyaddr in -lbind" >&5 +echo "configure:3648: 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 @@ -3637,7 +3648,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:3667: \"$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 @@ -3857,17 +3868,17 @@ EOF fi ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6 -echo "configure:3861: checking for crt_externs.h" >&5 +echo "configure:3876: checking for crt_externs.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:3871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3886: \"$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* @@ -4777,80 +4788,6 @@ EOF _OPTIMIZE_FLAGS=-O2 ;; -*-ncr-sysv*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define SVR4 1 -EOF - - cat >> confdefs.h <<\EOF -#define SYSV 1 -EOF - - cat >> confdefs.h <<\EOF -#define NCR 1 -EOF - - USE_NSPR_THREADS=1 - if test "$OS_RELEASE" = "2.03"; then - cat >> confdefs.h <<\EOF -#define _PR_STAT_HAS_ST_ATIM 1 -EOF - - else - cat >> confdefs.h <<\EOF -#define _PR_STAT_HAS_ST_ATIM_UNION 1 -EOF - - fi - - if test -z "$GNU_CC"; then - CFLAGS="$CFLAGS -Hnocopyr" - CXXFLAGS="$CXXFLAGS -Hnocopyr" - else - CFLAGS="$CFLAGS -fPIC -Wall" - CXXFLAGS="$CXXFLAGS -fPIC -Wall" - DSO_LDOPTS=-G - fi - MDCPUCFG_H=_ncr.cfg - PR_MD_CSRCS=ncr.c - ;; - -mips-nec-sysv*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define SVR4 1 -EOF - - cat >> confdefs.h <<\EOF -#define __SVR4 1 -EOF - - cat >> confdefs.h <<\EOF -#define NEC 1 -EOF - - cat >> confdefs.h <<\EOF -#define nec_ews 1 -EOF - - USE_NSPR_THREADS=1 - if test -z "$GNU_CC"; then - CC='$(NSDEPTH)/build/hcc cc -Xa -KGnum=0 -KOlimit=4000' - CXX=g++ - fi - OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" - DSO_LDOPTS=-G - MDCPUCFG_H=_nec.cfg - PR_MD_CSRCS=nec.c - ;; - *-netbsd*) cat >> confdefs.h <<\EOF #define XP_UNIX 1 @@ -4892,69 +4829,6 @@ EOF fi ;; -mips-sony-newsos*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define SONY 1 -EOF - - cat >> confdefs.h <<\EOF -#define SYSV 1 -EOF - - cat >> confdefs.h <<\EOF -#define SVR4 1 -EOF - - cat >> confdefs.h <<\EOF -#define __svr4 1 -EOF - - cat >> confdefs.h <<\EOF -#define __svr4__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_SVID_GETTOD 1 -EOF - - USE_NSPR_THREADS=1 - CFLAGS="$CFLAGS -Xa -fullwarn" - CXXFLAGS="$CXXFLAGS -Xa -fullwarn" - DSO_LDOPTS=-G - MDCPUCFG_H=_sony.cfg - PR_MD_CSRCS=sony.c - ;; - -*-nextstep*|*-openstep*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define NEXTSTEP 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_BSD_FLOCK 1 -EOF - - cat >> confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - - CFLAGS="$CFLAGS -Wall -fno-common -traditional-cpp -posix" - CXXFLAGS="$CXXFLAGS -Wall -fno-common -traditional-cpp -posix" - USE_NSPR_THREADS=1 - DLL_SUFFIX=dylib - MDCPUCFG_H=_nextstep.cfg - PR_MD_CSRCS=nextstep.c - ;; - - *-nto*) cat >> confdefs.h <<\EOF #define XP_UNIX 1 @@ -5048,17 +4922,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:5052: checking for machine/builtins.h" >&5 +echo "configure:4930: 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:5062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4940: \"$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* @@ -5186,96 +5060,6 @@ EOF PR_MD_SRCS=scoos.c ;; -*-sinix*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define SVR4 1 -EOF - - cat >> confdefs.h <<\EOF -#define SNI 1 -EOF - - cat >> confdefs.h <<\EOF -#define RELIANTUNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define sinix 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_SVID_GETTOD 1 -EOF - - if echo "$OS_TEST" | grep -c 86 2>/dev/null; then - cat >> confdefs.h <<\EOF -#define i386 1 -EOF - - CPU_ARCH=x86 - else - CPU_ARCH=mips - fi - - if test "$GNU_CC"; then - AS='$(CC) -x assembler-with-cpp' - if test "$CPU_ARCH" = "mips"; then - LD=gld - fi - CFLAGS="$CFLAGS -Wall -Wno-format" - else - AS='/usr/bin/cc' - _OPTIMIZE_FLAGS='-O -F Olimit,4000' - fi - - DSO_LDOPTS='-G -z defs -h $(@:$(OBJDIR)/%.so=%.so)' - - if test "$OS_RELEASE" = "5.43"; then - cat >> confdefs.h <<\EOF -#define IP_MULTICAST 1 -EOF - - fi - - OS_LIBS="$OS_LIBS -lsocket -lnsl -lresolv -ldl -lc" - USE_NSPR_THREADS=1 - MDCPUCFG_H=_reliantunix.cfg - PR_MD_CSRCS=reliantunix.c - if test "${OS_ARCH}" = "mips"; then - PR_MD_ASFILES=os_ReliantUNIX.s - fi - ;; - -*-sunos*) - cat >> confdefs.h <<\EOF -#define XP_UNIX 1 -EOF - - cat >> confdefs.h <<\EOF -#define SUNOS4 1 -EOF - - CFLAGS="$CFLAGS -Wall -Wno-format" - if test "$USE_MDUPDATE"; then - CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" - fi - CPU_ARCH=sparc - DLL_SUFFIX=so.1.0 - DSO_LDOPTS= - DSO_CFLAGS=-fPIC - USE_NSPR_THREADS=1 - if test "$OS_RELEASE" = "4.1.3_U1"; then - _OPTIMIZE_FLAGS= - OS_LIBS="$OS_LIBS -lm" - fi - MDCPUCFG_H=_sunos4.cfg - PR_MD_CSRCS=sunos4.c - ;; - *-solaris*) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 @@ -5707,7 +5491,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5711: checking for dlopen in -ldl" >&5 +echo "configure:5499: 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 @@ -5715,7 +5499,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:5518: \"$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 @@ -5743,17 +5527,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:5747: checking for dlfcn.h" >&5 +echo "configure:5535: 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:5757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5545: \"$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* @@ -5786,13 +5570,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:5790: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5578: 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 @@ -5810,7 +5594,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5833,15 +5617,15 @@ fi _SAVE_LIBS="$LIBS" LIBS="$LIBS $OS_LIBS" -for ac_func in lchown strerror dladdr +for ac_func in dladdr gettid lchown setpriority strerror syscall do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5840: checking for $ac_func" >&5 +echo "configure:5628: 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:5656: \"$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 @@ -5916,7 +5700,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:5920: checking for $ac_word" >&5 +echo "configure:5708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5975,7 +5759,7 @@ hpux*) if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5979: checking for +Olit support" >&5 +echo "configure:5767: 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 @@ -6017,7 +5801,7 @@ wince*) *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:6021: checking for pthread_create in -lpthreads" >&5 +echo "configure:5809: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { return v; } @@ -6039,7 +5823,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:6043: checking for pthread_create in -lpthread" >&5 +echo "configure:5831: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { return v; } @@ -6061,7 +5845,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:6065: checking for pthread_create in -lc_r" >&5 +echo "configure:5853: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { return v; } @@ -6083,7 +5867,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:6087: checking for pthread_create in -lc" >&5 +echo "configure:5875: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { return v; } @@ -6201,7 +5985,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:6205: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5993: 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 @@ -6224,7 +6008,7 @@ echo "configure:6205: 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:6228: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:6016: 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 @@ -6809,7 +6593,7 @@ s%\[%\\&%g s%\]%\\&%g s%\$%$$%g EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` # Manually modified for MKS support. +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` rm -f conftest.defs diff --git a/mozilla/nsprpub/configure.in b/nspr/configure.in similarity index 96% rename from mozilla/nsprpub/configure.in rename to nspr/configure.in index da7961c..59598c0 100644 --- a/mozilla/nsprpub/configure.in +++ b/nspr/configure.in @@ -14,8 +14,8 @@ dnl ======================================================== dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=9 -MOD_PATCH_VERSION=2 +MOD_MINOR_VERSION=10 +MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -111,11 +111,20 @@ AC_ARG_WITH(android-toolchain, location of the Android toolchain], android_toolchain=$withval) +dnl The default android_version is different for each target cpu. +case "$target_cpu" in +arm) + android_version=5 + ;; +i?86|mipsel) + android_version=9 + ;; +esac + AC_ARG_WITH(android-version, [ --with-android-version=VER - Android platform version, default 5], - android_version=$withval, - android_version=5) + Android platform version, default 5 for arm, 9 for x86/mips], + android_version=$withval) AC_ARG_WITH(android-platform, [ --with-android-platform=DIR @@ -127,7 +136,7 @@ arm-linux*-android*|*-linuxandroid*) android_tool_prefix="arm-linux-androideabi" ;; i?86-*android*) - android_tool_prefix="i686-android-linux" + android_tool_prefix="i686-linux-android" ;; mipsel-*android*) android_tool_prefix="mipsel-linux-android" @@ -221,6 +230,17 @@ case "$target" in fi fi + dnl Old NDK support. If minimum requirement is changed to NDK r8b, + dnl please remove this. + case "$target_cpu" in + i?86) + if ! test -e "$android_toolchain"/bin/"$android_tool_prefix"-gcc; then + dnl Old NDK toolchain name + android_tool_prefix="i686-android-linux" + fi + ;; + esac + dnl set up compilers AS="$android_toolchain"/bin/"$android_tool_prefix"-as CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc @@ -251,7 +271,6 @@ case "$target" in fi AC_DEFINE(ANDROID) - AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version) ;; esac fi @@ -573,9 +592,9 @@ if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then LDFLAGS="$HOST_LDFLAGS" AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) - AC_TRY_COMPILE([], [return(0);], - [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])], - AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) ) + AC_TRY_COMPILE([], [return 0;], + [AC_MSG_RESULT([yes])], + [AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.])] ) CC=$_SAVE_CC CFLAGS=$_SAVE_CFLAGS @@ -2065,47 +2084,6 @@ tools are selected during the Xcode/Developer Tools installation.]) _OPTIMIZE_FLAGS=-O2 ;; -*-ncr-sysv*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(SVR4) - AC_DEFINE(SYSV) - AC_DEFINE(NCR) - USE_NSPR_THREADS=1 - if test "$OS_RELEASE" = "2.03"; then - AC_DEFINE(_PR_STAT_HAS_ST_ATIM) - else - AC_DEFINE(_PR_STAT_HAS_ST_ATIM_UNION) - fi - - if test -z "$GNU_CC"; then - CFLAGS="$CFLAGS -Hnocopyr" - CXXFLAGS="$CXXFLAGS -Hnocopyr" - else - CFLAGS="$CFLAGS -fPIC -Wall" - CXXFLAGS="$CXXFLAGS -fPIC -Wall" - DSO_LDOPTS=-G - fi - MDCPUCFG_H=_ncr.cfg - PR_MD_CSRCS=ncr.c - ;; - -mips-nec-sysv*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(SVR4) - AC_DEFINE(__SVR4) - AC_DEFINE(NEC) - AC_DEFINE(nec_ews) - USE_NSPR_THREADS=1 - if test -z "$GNU_CC"; then - CC='$(NSDEPTH)/build/hcc cc -Xa -KGnum=0 -KOlimit=4000' - CXX=g++ - fi - OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" - DSO_LDOPTS=-G - MDCPUCFG_H=_nec.cfg - PR_MD_CSRCS=nec.c - ;; - *-netbsd*) AC_DEFINE(XP_UNIX) AC_DEFINE(NETBSD) @@ -2138,36 +2116,6 @@ mips-nec-sysv*) fi ;; -mips-sony-newsos*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(SONY) - AC_DEFINE(SYSV) - AC_DEFINE(SVR4) - AC_DEFINE(__svr4) - AC_DEFINE(__svr4__) - AC_DEFINE(HAVE_SVID_GETTOD) - USE_NSPR_THREADS=1 - CFLAGS="$CFLAGS -Xa -fullwarn" - CXXFLAGS="$CXXFLAGS -Xa -fullwarn" - DSO_LDOPTS=-G - MDCPUCFG_H=_sony.cfg - PR_MD_CSRCS=sony.c - ;; - -*-nextstep*|*-openstep*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(NEXTSTEP) - AC_DEFINE(HAVE_BSD_FLOCK) - AC_DEFINE(_POSIX_SOURCE) - CFLAGS="$CFLAGS -Wall -fno-common -traditional-cpp -posix" - CXXFLAGS="$CXXFLAGS -Wall -fno-common -traditional-cpp -posix" - USE_NSPR_THREADS=1 - DLL_SUFFIX=dylib - MDCPUCFG_H=_nextstep.cfg - PR_MD_CSRCS=nextstep.c - ;; - - *-nto*) AC_DEFINE(XP_UNIX) AC_DEFINE(NTO) @@ -2280,66 +2228,6 @@ mips-sony-newsos*) PR_MD_SRCS=scoos.c ;; -*-sinix*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(SVR4) - AC_DEFINE(SNI) - AC_DEFINE(RELIANTUNIX) - AC_DEFINE(sinix) - AC_DEFINE(HAVE_SVID_GETTOD) - if echo "$OS_TEST" | grep -c 86 2>/dev/null; then - AC_DEFINE(i386) - CPU_ARCH=x86 - else - CPU_ARCH=mips - fi - - if test "$GNU_CC"; then - AS='$(CC) -x assembler-with-cpp' - if test "$CPU_ARCH" = "mips"; then - LD=gld - fi - CFLAGS="$CFLAGS -Wall -Wno-format" - else - AS='/usr/bin/cc' - _OPTIMIZE_FLAGS='-O -F Olimit,4000' - fi - - DSO_LDOPTS='-G -z defs -h $(@:$(OBJDIR)/%.so=%.so)' - - if test "$OS_RELEASE" = "5.43"; then - AC_DEFINE(IP_MULTICAST) - fi - - OS_LIBS="$OS_LIBS -lsocket -lnsl -lresolv -ldl -lc" - USE_NSPR_THREADS=1 - MDCPUCFG_H=_reliantunix.cfg - PR_MD_CSRCS=reliantunix.c - if test "${OS_ARCH}" = "mips"; then - PR_MD_ASFILES=os_ReliantUNIX.s - fi - ;; - -*-sunos*) - AC_DEFINE(XP_UNIX) - AC_DEFINE(SUNOS4) - CFLAGS="$CFLAGS -Wall -Wno-format" - if test "$USE_MDUPDATE"; then - CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" - fi - CPU_ARCH=sparc - DLL_SUFFIX=so.1.0 - DSO_LDOPTS= - DSO_CFLAGS=-fPIC - USE_NSPR_THREADS=1 - if test "$OS_RELEASE" = "4.1.3_U1"; then - _OPTIMIZE_FLAGS= - OS_LIBS="$OS_LIBS -lm" - fi - MDCPUCFG_H=_sunos4.cfg - PR_MD_CSRCS=sunos4.c - ;; - *-solaris*) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 @@ -2664,8 +2552,8 @@ case $target in ;; *) AC_CHECK_LIB(dl, dlopen, - AC_CHECK_HEADER(dlfcn.h, - OS_LIBS="-ldl $OS_LIBS")) + [AC_CHECK_HEADER(dlfcn.h, + OS_LIBS="-ldl $OS_LIBS")]) ;; esac @@ -2699,7 +2587,7 @@ dnl ======================================================== AC_PROG_GCC_TRADITIONAL _SAVE_LIBS="$LIBS" LIBS="$LIBS $OS_LIBS" -AC_CHECK_FUNCS(lchown strerror dladdr) +AC_CHECK_FUNCS(dladdr gettid lchown setpriority strerror syscall) LIBS="$_SAVE_LIBS" dnl AC_FUNC_MEMCMP diff --git a/mozilla/nsprpub/tools/.cvsignore b/nspr/lib/.cvsignore similarity index 100% rename from mozilla/nsprpub/tools/.cvsignore rename to nspr/lib/.cvsignore diff --git a/mozilla/nsprpub/lib/Makefile.in b/nspr/lib/Makefile.in similarity index 100% rename from mozilla/nsprpub/lib/Makefile.in rename to nspr/lib/Makefile.in diff --git a/mozilla/nsprpub/lib/libc/src/.cvsignore b/nspr/lib/ds/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/libc/src/.cvsignore rename to nspr/lib/ds/.cvsignore diff --git a/mozilla/nsprpub/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in similarity index 96% rename from mozilla/nsprpub/lib/ds/Makefile.in rename to nspr/lib/ds/Makefile.in index ce55f4d..e737791 100644 --- a/mozilla/nsprpub/lib/ds/Makefile.in +++ b/nspr/lib/ds/Makefile.in @@ -73,13 +73,10 @@ endif EXTRA_LIBS = $(LIBNSPR) -# On NCR and SCOOS, we can't link with extra libraries when +# On SCOOS, we can't link with extra libraries when # we build a shared library. If we do so, the linker doesn't # complain, but we would run into weird problems at run-time. # Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif diff --git a/mozilla/nsprpub/lib/ds/plarena.c b/nspr/lib/ds/plarena.c similarity index 94% rename from mozilla/nsprpub/lib/ds/plarena.c rename to nspr/lib/ds/plarena.c index 5b1e53a..23610ea 100644 --- a/mozilla/nsprpub/lib/ds/plarena.c +++ b/nspr/lib/ds/plarena.c @@ -201,6 +201,7 @@ PR_IMPLEMENT(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb) if ( NULL != a ) { a->limit = (PRUword)a + sz; a->base = a->avail = (PRUword)PL_ARENA_ALIGN(pool, a + 1); + PL_MAKE_MEM_NOACCESS((void*)a->avail, a->limit - a->avail); rp = (char *)a->avail; a->avail += nb; /* the newly allocated arena is linked after pool->current @@ -237,7 +238,8 @@ static void ClearArenaList(PLArena *a, PRInt32 pattern) for (; a; a = a->next) { PR_ASSERT(a->base <= a->avail && a->avail <= a->limit); a->avail = a->base; - PL_CLEAR_UNUSED_PATTERN(a, pattern); + PL_CLEAR_UNUSED_PATTERN(a, pattern); + PL_MAKE_MEM_NOACCESS((void*)a->avail, a->limit - a->avail); } } @@ -273,6 +275,8 @@ static void FreeArenaList(PLArenaPool *pool, PLArena *head, PRBool reallyFree) } else { /* Insert the whole arena chain at the front of the freelist. */ do { + PL_MAKE_MEM_NOACCESS((void*)(*ap)->base, + (*ap)->limit - (*ap)->base); ap = &(*ap)->next; } while (*ap); LockArena(); @@ -345,6 +349,22 @@ PR_IMPLEMENT(void) PL_ArenaFinish(void) once = pristineCallOnce; } +PR_IMPLEMENT(size_t) PL_SizeOfArenaPoolExcludingPool( + const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf) +{ + /* + * The first PLArena is within |pool|, so don't measure it. Subsequent + * PLArenas are separate and must be measured. + */ + size_t size = 0; + const PLArena *arena = pool->first.next; + while (arena) { + size += mallocSizeOf(arena); + arena = arena->next; + } + return size; +} + #ifdef PL_ARENAMETER PR_IMPLEMENT(void) PL_ArenaCountAllocation(PLArenaPool *pool, PRUint32 nb) { diff --git a/mozilla/nsprpub/lib/ds/plarena.h b/nspr/lib/ds/plarena.h similarity index 68% rename from mozilla/nsprpub/lib/ds/plarena.h rename to nspr/lib/ds/plarena.h index 4d54cc4..8dcfb3e 100644 --- a/mozilla/nsprpub/lib/ds/plarena.h +++ b/nspr/lib/ds/plarena.h @@ -58,6 +58,68 @@ struct PLArenaPool { }; /* + * WARNING: The PL_MAKE_MEM_ macros are for internal use by NSPR. Do NOT use + * them in your code. + * + * NOTE: Valgrind support to be added. + * + * The PL_MAKE_MEM_ macros are modeled after the MOZ_MAKE_MEM_ macros in + * Mozilla's mfbt/MemoryChecking.h. Only AddressSanitizer is supported now. + * + * Provides a common interface to the ASan (AddressSanitizer) and Valgrind + * functions used to mark memory in certain ways. In detail, the following + * three macros are provided: + * + * PL_MAKE_MEM_NOACCESS - Mark memory as unsafe to access (e.g. freed) + * PL_MAKE_MEM_UNDEFINED - Mark memory as accessible, with content undefined + * PL_MAKE_MEM_DEFINED - Mark memory as accessible, with content defined + * + * With Valgrind in use, these directly map to the three respective Valgrind + * macros. With ASan in use, the NOACCESS macro maps to poisoning the memory, + * while the UNDEFINED/DEFINED macros unpoison memory. + * + * With no memory checker available, all macros expand to the empty statement. + */ + +/* WARNING: PL_SANITIZE_ADDRESS is for internal use by this header. Do NOT + * define or test this macro in your code. + */ +#if defined(__has_feature) +#if __has_feature(address_sanitizer) +#define PL_SANITIZE_ADDRESS 1 +#endif +#elif defined(__SANITIZE_ADDRESS__) +#define PL_SANITIZE_ADDRESS 1 +#endif + +#if defined(PL_SANITIZE_ADDRESS) + +/* These definitions are usually provided through the + * sanitizer/asan_interface.h header installed by ASan. + * See https://code.google.com/p/address-sanitizer/wiki/ManualPoisoning + */ + +void __asan_poison_memory_region(void const volatile *addr, size_t size); +void __asan_unpoison_memory_region(void const volatile *addr, size_t size); + +#define PL_MAKE_MEM_NOACCESS(addr, size) \ + __asan_poison_memory_region((addr), (size)) + +#define PL_MAKE_MEM_UNDEFINED(addr, size) \ + __asan_unpoison_memory_region((addr), (size)) + +#define PL_MAKE_MEM_DEFINED(addr, size) \ + __asan_unpoison_memory_region((addr), (size)) + +#else + +#define PL_MAKE_MEM_NOACCESS(addr, size) +#define PL_MAKE_MEM_UNDEFINED(addr, size) +#define PL_MAKE_MEM_DEFINED(addr, size) + +#endif + +/* * If the including .c file uses only one power-of-2 alignment, it may define * PL_ARENA_CONST_ALIGN_MASK to the alignment mask and save a few instructions * per ALLOCATE and GROW. @@ -78,11 +140,13 @@ struct PLArenaPool { PRUint32 _nb = PL_ARENA_ALIGN(pool, nb); \ PRUword _p = _a->avail; \ PRUword _q = _p + _nb; \ - if (_q > _a->limit) \ + if (_q > _a->limit) { \ _p = (PRUword)PL_ArenaAllocate(pool, _nb); \ - else \ + } else { \ _a->avail = _q; \ + } \ p = (void *)_p; \ + PL_MAKE_MEM_UNDEFINED(p, nb); \ PL_ArenaCountAllocation(pool, nb); \ PR_END_MACRO @@ -94,6 +158,7 @@ struct PLArenaPool { PRUword _q = _p + _incr; \ if (_p == (PRUword)(p) + PL_ARENA_ALIGN(pool, size) && \ _q <= _a->limit) { \ + PL_MAKE_MEM_UNDEFINED((unsigned char *)(p) + size, incr); \ _a->avail = _q; \ PL_ArenaCountInplaceGrowth(pool, size, incr); \ } else { \ @@ -106,13 +171,19 @@ struct PLArenaPool { #define PR_UPTRDIFF(p,q) ((PRUword)(p) - (PRUword)(q)) #define PL_CLEAR_UNUSED_PATTERN(a, pattern) \ - (PR_ASSERT((a)->avail <= (a)->limit), \ - memset((void*)(a)->avail, (pattern), (a)->limit - (a)->avail)) + PR_BEGIN_MACRO \ + PR_ASSERT((a)->avail <= (a)->limit); \ + PL_MAKE_MEM_UNDEFINED((void*)(a)->avail, (a)->limit - (a)->avail); \ + memset((void*)(a)->avail, (pattern), (a)->limit - (a)->avail); \ + PR_END_MACRO #ifdef DEBUG #define PL_FREE_PATTERN 0xDA #define PL_CLEAR_UNUSED(a) PL_CLEAR_UNUSED_PATTERN((a), PL_FREE_PATTERN) -#define PL_CLEAR_ARENA(a) memset((void*)(a), PL_FREE_PATTERN, \ - (a)->limit - (PRUword)(a)) +#define PL_CLEAR_ARENA(a) \ + PR_BEGIN_MACRO \ + PL_MAKE_MEM_UNDEFINED((void*)(a), (a)->limit - (PRUword)(a)); \ + memset((void*)(a), PL_FREE_PATTERN, (a)->limit - (PRUword)(a)); \ + PR_END_MACRO #else #define PL_CLEAR_UNUSED(a) #define PL_CLEAR_ARENA(a) @@ -125,6 +196,7 @@ struct PLArenaPool { if (PR_UPTRDIFF(_m, _a->base) <= PR_UPTRDIFF(_a->avail, _a->base)) { \ _a->avail = (PRUword)PL_ARENA_ALIGN(pool, _m); \ PL_CLEAR_UNUSED(_a); \ + PL_MAKE_MEM_NOACCESS((void*)_a->avail, _a->limit - _a->avail); \ PL_ArenaCountRetract(pool, _m); \ } else { \ PL_ArenaRelease(pool, _m); \ diff --git a/mozilla/nsprpub/lib/ds/plarenas.h b/nspr/lib/ds/plarenas.h similarity index 81% rename from mozilla/nsprpub/lib/ds/plarenas.h rename to nspr/lib/ds/plarenas.h index b470562..98bd7f8 100644 --- a/mozilla/nsprpub/lib/ds/plarenas.h +++ b/nspr/lib/ds/plarenas.h @@ -47,6 +47,9 @@ PR_EXTERN(void) PL_CompactArenaPool(PLArenaPool *pool); /* ** Friend functions used by the PL_ARENA_*() macros. +** +** WARNING: do not call these functions directly. Always use the +** PL_ARENA_*() macros. **/ PR_EXTERN(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb); @@ -60,6 +63,19 @@ PR_EXTERN(void) PL_ArenaRelease(PLArenaPool *pool, char *mark); */ PR_EXTERN(void) PL_ClearArenaPool(PLArenaPool *pool, PRInt32 pattern); +/* +** A function like malloc_size() or malloc_usable_size() that measures the +** size of a heap block. +*/ +typedef size_t (*PLMallocSizeFn)(const void *ptr); + +/* +** Measure all memory used by a PLArenaPool, excluding the PLArenaPool +** structure. +*/ +PR_EXTERN(size_t) PL_SizeOfArenaPoolExcludingPool( + const PLArenaPool *pool, PLMallocSizeFn mallocSizeOf); + PR_END_EXTERN_C #endif /* PLARENAS_H */ diff --git a/mozilla/nsprpub/lib/ds/plds.def b/nspr/lib/ds/plds.def similarity index 95% rename from mozilla/nsprpub/lib/ds/plds.def rename to nspr/lib/ds/plds.def index 5c672ab..cc54a4d 100644 --- a/mozilla/nsprpub/lib/ds/plds.def +++ b/nspr/lib/ds/plds.def @@ -54,3 +54,7 @@ PL_HashTableRawLookupConst; ;+ global: PL_ClearArenaPool; ;+} NSPR_4.1; +;+NSPR_4.9.6 { +;+ global: +PL_SizeOfArenaPoolExcludingPool; +;+} NSPR_4.8.5; diff --git a/mozilla/nsprpub/lib/ds/plds.rc b/nspr/lib/ds/plds.rc similarity index 100% rename from mozilla/nsprpub/lib/ds/plds.rc rename to nspr/lib/ds/plds.rc diff --git a/mozilla/nsprpub/lib/ds/plhash.c b/nspr/lib/ds/plhash.c similarity index 100% rename from mozilla/nsprpub/lib/ds/plhash.c rename to nspr/lib/ds/plhash.c diff --git a/mozilla/nsprpub/lib/ds/plhash.h b/nspr/lib/ds/plhash.h similarity index 100% rename from mozilla/nsprpub/lib/ds/plhash.h rename to nspr/lib/ds/plhash.h diff --git a/mozilla/nsprpub/lib/ds/plvrsion.c b/nspr/lib/ds/plvrsion.c similarity index 100% rename from mozilla/nsprpub/lib/ds/plvrsion.c rename to nspr/lib/ds/plvrsion.c diff --git a/mozilla/nsprpub/pr/tests/dll/.cvsignore b/nspr/lib/libc/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/tests/dll/.cvsignore rename to nspr/lib/libc/.cvsignore diff --git a/mozilla/nsprpub/lib/libc/Makefile.in b/nspr/lib/libc/Makefile.in similarity index 100% rename from mozilla/nsprpub/lib/libc/Makefile.in rename to nspr/lib/libc/Makefile.in diff --git a/mozilla/nsprpub/lib/libc/src/README b/nspr/lib/libc/README similarity index 100% rename from mozilla/nsprpub/lib/libc/src/README rename to nspr/lib/libc/README diff --git a/mozilla/nsprpub/pr/tests/.cvsignore b/nspr/lib/libc/include/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/tests/.cvsignore rename to nspr/lib/libc/include/.cvsignore diff --git a/mozilla/nsprpub/lib/libc/include/Makefile.in b/nspr/lib/libc/include/Makefile.in similarity index 100% rename from mozilla/nsprpub/lib/libc/include/Makefile.in rename to nspr/lib/libc/include/Makefile.in diff --git a/mozilla/nsprpub/lib/libc/include/README b/nspr/lib/libc/include/README similarity index 100% rename from mozilla/nsprpub/lib/libc/include/README rename to nspr/lib/libc/include/README diff --git a/mozilla/nsprpub/lib/libc/include/plbase64.h b/nspr/lib/libc/include/plbase64.h similarity index 100% rename from mozilla/nsprpub/lib/libc/include/plbase64.h rename to nspr/lib/libc/include/plbase64.h diff --git a/mozilla/nsprpub/lib/libc/include/plerror.h b/nspr/lib/libc/include/plerror.h similarity index 100% rename from mozilla/nsprpub/lib/libc/include/plerror.h rename to nspr/lib/libc/include/plerror.h diff --git a/mozilla/nsprpub/lib/libc/include/plgetopt.h b/nspr/lib/libc/include/plgetopt.h similarity index 100% rename from mozilla/nsprpub/lib/libc/include/plgetopt.h rename to nspr/lib/libc/include/plgetopt.h diff --git a/mozilla/nsprpub/lib/libc/include/plstr.h b/nspr/lib/libc/include/plstr.h similarity index 100% rename from mozilla/nsprpub/lib/libc/include/plstr.h rename to nspr/lib/libc/include/plstr.h diff --git a/mozilla/nsprpub/lib/ds/.cvsignore b/nspr/lib/libc/src/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/ds/.cvsignore rename to nspr/lib/libc/src/.cvsignore diff --git a/mozilla/nsprpub/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in similarity index 96% rename from mozilla/nsprpub/lib/libc/src/Makefile.in rename to nspr/lib/libc/src/Makefile.in index 5b1f7f4..e8a6d9f 100644 --- a/mozilla/nsprpub/lib/libc/src/Makefile.in +++ b/nspr/lib/libc/src/Makefile.in @@ -82,13 +82,10 @@ endif EXTRA_LIBS = $(LIBNSPR) -# On NCR and SCOOS, we can't link with extra libraries when +# On SCOOS, we can't link with extra libraries when # we build a shared library. If we do so, the linker doesn't # complain, but we would run into weird problems at run-time. # Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif diff --git a/mozilla/nsprpub/lib/libc/README b/nspr/lib/libc/src/README similarity index 100% rename from mozilla/nsprpub/lib/libc/README rename to nspr/lib/libc/src/README diff --git a/mozilla/nsprpub/lib/libc/src/base64.c b/nspr/lib/libc/src/base64.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/base64.c rename to nspr/lib/libc/src/base64.c diff --git a/mozilla/nsprpub/lib/libc/src/plc.def b/nspr/lib/libc/src/plc.def similarity index 100% rename from mozilla/nsprpub/lib/libc/src/plc.def rename to nspr/lib/libc/src/plc.def diff --git a/mozilla/nsprpub/lib/libc/src/plc.rc b/nspr/lib/libc/src/plc.rc similarity index 100% rename from mozilla/nsprpub/lib/libc/src/plc.rc rename to nspr/lib/libc/src/plc.rc diff --git a/mozilla/nsprpub/lib/libc/src/plerror.c b/nspr/lib/libc/src/plerror.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/plerror.c rename to nspr/lib/libc/src/plerror.c diff --git a/mozilla/nsprpub/lib/libc/src/plgetopt.c b/nspr/lib/libc/src/plgetopt.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/plgetopt.c rename to nspr/lib/libc/src/plgetopt.c diff --git a/mozilla/nsprpub/lib/libc/src/plvrsion.c b/nspr/lib/libc/src/plvrsion.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/plvrsion.c rename to nspr/lib/libc/src/plvrsion.c diff --git a/mozilla/nsprpub/lib/libc/src/strcase.c b/nspr/lib/libc/src/strcase.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strcase.c rename to nspr/lib/libc/src/strcase.c diff --git a/mozilla/nsprpub/lib/libc/src/strcat.c b/nspr/lib/libc/src/strcat.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strcat.c rename to nspr/lib/libc/src/strcat.c diff --git a/mozilla/nsprpub/lib/libc/src/strchr.c b/nspr/lib/libc/src/strchr.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strchr.c rename to nspr/lib/libc/src/strchr.c diff --git a/mozilla/nsprpub/lib/libc/src/strcmp.c b/nspr/lib/libc/src/strcmp.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strcmp.c rename to nspr/lib/libc/src/strcmp.c diff --git a/mozilla/nsprpub/lib/libc/src/strcpy.c b/nspr/lib/libc/src/strcpy.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strcpy.c rename to nspr/lib/libc/src/strcpy.c diff --git a/mozilla/nsprpub/lib/libc/src/strdup.c b/nspr/lib/libc/src/strdup.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strdup.c rename to nspr/lib/libc/src/strdup.c diff --git a/mozilla/nsprpub/lib/libc/src/strlen.c b/nspr/lib/libc/src/strlen.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strlen.c rename to nspr/lib/libc/src/strlen.c diff --git a/mozilla/nsprpub/lib/libc/src/strpbrk.c b/nspr/lib/libc/src/strpbrk.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strpbrk.c rename to nspr/lib/libc/src/strpbrk.c diff --git a/mozilla/nsprpub/lib/libc/src/strstr.c b/nspr/lib/libc/src/strstr.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strstr.c rename to nspr/lib/libc/src/strstr.c diff --git a/mozilla/nsprpub/lib/libc/src/strtok.c b/nspr/lib/libc/src/strtok.c similarity index 100% rename from mozilla/nsprpub/lib/libc/src/strtok.c rename to nspr/lib/libc/src/strtok.c diff --git a/mozilla/nsprpub/pr/src/threads/combined/.cvsignore b/nspr/lib/prstreams/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/.cvsignore rename to nspr/lib/prstreams/.cvsignore diff --git a/mozilla/nsprpub/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in similarity index 96% rename from mozilla/nsprpub/lib/prstreams/Makefile.in rename to nspr/lib/prstreams/Makefile.in index f06e96c..aeb2944 100644 --- a/mozilla/nsprpub/lib/prstreams/Makefile.in +++ b/nspr/lib/prstreams/Makefile.in @@ -77,13 +77,10 @@ endif EXTRA_LIBS = $(LIBNSPR) -# On NCR and SCOOS, we can't link with extra libraries when +# On SCOOS, we can't link with extra libraries when # we build a shared library. If we do so, the linker doesn't # complain, but we would run into weird problems at run-time. # Therefore on these platforms, we link just the object files. -ifeq ($(OS_ARCH),NCR) - EXTRA_LIBS = -endif ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif diff --git a/mozilla/nsprpub/lib/prstreams/plvrsion.c b/nspr/lib/prstreams/plvrsion.c similarity index 100% rename from mozilla/nsprpub/lib/prstreams/plvrsion.c rename to nspr/lib/prstreams/plvrsion.c diff --git a/mozilla/nsprpub/lib/prstreams/prstrms.cpp b/nspr/lib/prstreams/prstrms.cpp similarity index 100% rename from mozilla/nsprpub/lib/prstreams/prstrms.cpp rename to nspr/lib/prstreams/prstrms.cpp diff --git a/mozilla/nsprpub/lib/prstreams/prstrms.h b/nspr/lib/prstreams/prstrms.h similarity index 100% rename from mozilla/nsprpub/lib/prstreams/prstrms.h rename to nspr/lib/prstreams/prstrms.h diff --git a/mozilla/nsprpub/lib/prstreams/prstrms.rc b/nspr/lib/prstreams/prstrms.rc similarity index 100% rename from mozilla/nsprpub/lib/prstreams/prstrms.rc rename to nspr/lib/prstreams/prstrms.rc diff --git a/mozilla/nsprpub/pr/src/threads/.cvsignore b/nspr/lib/prstreams/tests/testprstrm/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/threads/.cvsignore rename to nspr/lib/prstreams/tests/testprstrm/.cvsignore diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in b/nspr/lib/prstreams/tests/testprstrm/Makefile.in similarity index 83% rename from mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in rename to nspr/lib/prstreams/tests/testprstrm/Makefile.in index 8ca61e9..4d0357a 100644 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in +++ b/nspr/lib/prstreams/tests/testprstrm/Makefile.in @@ -83,7 +83,6 @@ endif # Solaris ifeq ($(OS_ARCH), SunOS) -ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else @@ -94,27 +93,8 @@ ifdef USE_PTHREADS EXTRA_LIBS = -lpthread endif # USE_PTHREADS endif # NS_USE_GCC -endif # 4.1.3_U1 endif # SunOS -ifeq ($(OS_ARCH), NCR) -# XXX: We see some strange problems when we link with libnspr.so. -# So for now we use static libraries on NCR. The shared library -# stuff below is commented out. -LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a -LIBPRSTRMS = $(dist_libdir)/libprstrms$(MOD_MAJOR_VERSION).a -EXTRA_LIBS = -lsocket -lnsl -ldl - -# NCR needs to link against -lsocket -lnsl (and -lc, which is linked -# implicitly by $(CC)) again even though we already linked with these -# system libraries when we built libnspr.so. -#EXTRA_LIBS = -lsocket -lnsl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(dist_libdir) -endif - ifeq ($(OS_ARCH), SCOOS) # SCO Unix needs to link against -lsocket again even though we # already linked with these system libraries when we built libnspr.so. diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp b/nspr/lib/prstreams/tests/testprstrm/testprstrm.cpp similarity index 100% rename from mozilla/nsprpub/lib/prstreams/tests/testprstrm/testprstrm.cpp rename to nspr/lib/prstreams/tests/testprstrm/testprstrm.cpp diff --git a/mozilla/nsprpub/pr/src/pthreads/.cvsignore b/nspr/lib/tests/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/pthreads/.cvsignore rename to nspr/lib/tests/.cvsignore diff --git a/mozilla/nsprpub/lib/tests/Makefile.in b/nspr/lib/tests/Makefile.in similarity index 89% rename from mozilla/nsprpub/lib/tests/Makefile.in rename to nspr/lib/tests/Makefile.in index 35b0982..671b040 100644 --- a/mozilla/nsprpub/lib/tests/Makefile.in +++ b/nspr/lib/tests/Makefile.in @@ -102,13 +102,11 @@ endif # Solaris ifeq ($(OS_ARCH), SunOS) -ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else LDOPTS += -R $(PWD)/$(dist_libdir) endif -endif # SunOS 5.5 needs to link with -lpthread, even though we already # linked with this system library when we built libnspr.so. @@ -119,17 +117,6 @@ endif endif endif # SunOS -ifeq ($(OS_ARCH), NCR) -# NCR needs to link against -lsocket -lnsl (and -lc, which is linked -# implicitly by $(CC)) again even though we already linked with these -# system libraries when we built libnspr.so. -EXTRA_LIBS = -lsocket -lnsl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -export LD_RUN_PATH = $(PWD)/$(dist_libdir) -endif - ##################################################### # # The rules diff --git a/mozilla/nsprpub/lib/tests/arena.c b/nspr/lib/tests/arena.c similarity index 100% rename from mozilla/nsprpub/lib/tests/arena.c rename to nspr/lib/tests/arena.c diff --git a/mozilla/nsprpub/lib/tests/base64t.c b/nspr/lib/tests/base64t.c similarity index 100% rename from mozilla/nsprpub/lib/tests/base64t.c rename to nspr/lib/tests/base64t.c diff --git a/mozilla/nsprpub/lib/tests/getopt.c b/nspr/lib/tests/getopt.c similarity index 100% rename from mozilla/nsprpub/lib/tests/getopt.c rename to nspr/lib/tests/getopt.c diff --git a/mozilla/nsprpub/lib/tests/string.c b/nspr/lib/tests/string.c similarity index 100% rename from mozilla/nsprpub/lib/tests/string.c rename to nspr/lib/tests/string.c diff --git a/mozilla/nsprpub/pkg/Makefile.in b/nspr/pkg/Makefile.in similarity index 100% rename from mozilla/nsprpub/pkg/Makefile.in rename to nspr/pkg/Makefile.in diff --git a/mozilla/nsprpub/pkg/linux/Makefile.in b/nspr/pkg/linux/Makefile.in similarity index 97% rename from mozilla/nsprpub/pkg/linux/Makefile.in rename to nspr/pkg/linux/Makefile.in index 9d51bcc..63fa750 100644 --- a/mozilla/nsprpub/pkg/linux/Makefile.in +++ b/nspr/pkg/linux/Makefile.in @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.in,v 1.12 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # MOD_DEPTH = ../.. diff --git a/mozilla/nsprpub/pkg/linux/sun-nspr.spec b/nspr/pkg/linux/sun-nspr.spec similarity index 100% rename from mozilla/nsprpub/pkg/linux/sun-nspr.spec rename to nspr/pkg/linux/sun-nspr.spec diff --git a/mozilla/nsprpub/pkg/solaris/Makefile-devl.com b/nspr/pkg/solaris/Makefile-devl.com similarity index 90% rename from mozilla/nsprpub/pkg/solaris/Makefile-devl.com rename to nspr/pkg/solaris/Makefile-devl.com index 4a6366a..86eab39 100755 --- a/mozilla/nsprpub/pkg/solaris/Makefile-devl.com +++ b/nspr/pkg/solaris/Makefile-devl.com @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile-devl.com,v 1.4 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # MACH = $(shell mach) diff --git a/mozilla/nsprpub/pkg/solaris/Makefile-devl.targ b/nspr/pkg/solaris/Makefile-devl.targ similarity index 92% rename from mozilla/nsprpub/pkg/solaris/Makefile-devl.targ rename to nspr/pkg/solaris/Makefile-devl.targ index 32e14d3..210b501 100755 --- a/mozilla/nsprpub/pkg/solaris/Makefile-devl.targ +++ b/nspr/pkg/solaris/Makefile-devl.targ @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile-devl.targ,v 1.4 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # include $(srcdir)/../proto64.mk diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.com b/nspr/pkg/solaris/Makefile.com similarity index 91% rename from mozilla/nsprpub/pkg/solaris/Makefile.com rename to nspr/pkg/solaris/Makefile.com index 7515fcb..d4da887 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.com +++ b/nspr/pkg/solaris/Makefile.com @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.com,v 1.9 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # MACH = $(shell mach) diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.in b/nspr/pkg/solaris/Makefile.in similarity index 96% rename from mozilla/nsprpub/pkg/solaris/Makefile.in rename to nspr/pkg/solaris/Makefile.in index cdd6f1a..b34a23a 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.in +++ b/nspr/pkg/solaris/Makefile.in @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.in,v 1.4 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # MOD_DEPTH = ../.. diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.targ b/nspr/pkg/solaris/Makefile.targ similarity index 92% rename from mozilla/nsprpub/pkg/solaris/Makefile.targ rename to nspr/pkg/solaris/Makefile.targ index 5212ccd..742ee93 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.targ +++ b/nspr/pkg/solaris/Makefile.targ @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.targ,v 1.7 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # include $(srcdir)/../proto64.mk diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/Makefile.in b/nspr/pkg/solaris/SUNWpr/Makefile.in similarity index 88% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/Makefile.in rename to nspr/pkg/solaris/SUNWpr/Makefile.in index b07142f..9fe1f0a 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/Makefile.in +++ b/nspr/pkg/solaris/SUNWpr/Makefile.in @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.in,v 1.3 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # MOD_DEPTH = ../../.. diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/depend b/nspr/pkg/solaris/SUNWpr/depend similarity index 94% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/depend rename to nspr/pkg/solaris/SUNWpr/depend index 473cda5..4dd09c5 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/depend +++ b/nspr/pkg/solaris/SUNWpr/depend @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# $Id: depend,v 1.4 2012/03/06 13:13:41 gerv%gerv.net Exp $ +# $Id$ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl b/nspr/pkg/solaris/SUNWpr/pkginfo.tmpl similarity index 93% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl rename to nspr/pkg/solaris/SUNWpr/pkginfo.tmpl index 8ceec7c..3c1a107 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl +++ b/nspr/pkg/solaris/SUNWpr/pkginfo.tmpl @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: pkginfo.tmpl,v 1.4 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # # This required package information file describes characteristics of the diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com b/nspr/pkg/solaris/SUNWpr/prototype_com similarity index 94% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com rename to nspr/pkg/solaris/SUNWpr/prototype_com index 65fedba..4b994ea 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com +++ b/nspr/pkg/solaris/SUNWpr/prototype_com @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: prototype_com,v 1.5 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 b/nspr/pkg/solaris/SUNWpr/prototype_i386 similarity index 95% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 rename to nspr/pkg/solaris/SUNWpr/prototype_i386 index 09d49a9..e2f7a2f 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 +++ b/nspr/pkg/solaris/SUNWpr/prototype_i386 @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: prototype_i386,v 1.5 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc b/nspr/pkg/solaris/SUNWpr/prototype_sparc similarity index 96% rename from mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc rename to nspr/pkg/solaris/SUNWpr/prototype_sparc index a92b61b..aae5f18 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc +++ b/nspr/pkg/solaris/SUNWpr/prototype_sparc @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: prototype_sparc,v 1.5 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in b/nspr/pkg/solaris/SUNWprd/Makefile.in similarity index 88% rename from mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in rename to nspr/pkg/solaris/SUNWprd/Makefile.in index b6f1222..0cb4c28 100755 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in +++ b/nspr/pkg/solaris/SUNWprd/Makefile.in @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: Makefile.in,v 1.4 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # MOD_DEPTH = ../../.. diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/depend b/nspr/pkg/solaris/SUNWprd/depend similarity index 93% rename from mozilla/nsprpub/pkg/solaris/SUNWprd/depend rename to nspr/pkg/solaris/SUNWprd/depend index 8d4b1ff..2415c54 100755 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/depend +++ b/nspr/pkg/solaris/SUNWprd/depend @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# $Id: depend,v 1.4 2012/03/06 13:13:41 gerv%gerv.net Exp $ +# $Id$ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl b/nspr/pkg/solaris/SUNWprd/pkginfo.tmpl similarity index 94% rename from mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl rename to nspr/pkg/solaris/SUNWprd/pkginfo.tmpl index 8b3d6af..5003122 100755 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl +++ b/nspr/pkg/solaris/SUNWprd/pkginfo.tmpl @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: pkginfo.tmpl,v 1.4 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # # This required package information file describes characteristics of the diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/prototype b/nspr/pkg/solaris/SUNWprd/prototype similarity index 98% rename from mozilla/nsprpub/pkg/solaris/SUNWprd/prototype rename to nspr/pkg/solaris/SUNWprd/prototype index 4f645b6..44f52ba 100755 --- a/mozilla/nsprpub/pkg/solaris/SUNWprd/prototype +++ b/nspr/pkg/solaris/SUNWprd/prototype @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: prototype,v 1.7 2012/03/06 13:13:41 gerv%gerv.net Exp $" +#ident "$Id$" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/mozilla/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh b/nspr/pkg/solaris/bld_awk_pkginfo.ksh similarity index 95% rename from mozilla/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh rename to nspr/pkg/solaris/bld_awk_pkginfo.ksh index 260044b..67f1df7 100644 --- a/mozilla/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh +++ b/nspr/pkg/solaris/bld_awk_pkginfo.ksh @@ -7,7 +7,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: bld_awk_pkginfo.ksh,v 1.4 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # # Simple script which builds the awk_pkginfo awk script. This awk script # is used to convert the pkginfo.tmpl files into pkginfo files diff --git a/mozilla/nsprpub/pkg/solaris/common_files/copyright b/nspr/pkg/solaris/common_files/copyright similarity index 100% rename from mozilla/nsprpub/pkg/solaris/common_files/copyright rename to nspr/pkg/solaris/common_files/copyright diff --git a/mozilla/nsprpub/pkg/solaris/proto64.mk b/nspr/pkg/solaris/proto64.mk similarity index 85% rename from mozilla/nsprpub/pkg/solaris/proto64.mk rename to nspr/pkg/solaris/proto64.mk index 7d97e18..69bb1fc 100644 --- a/mozilla/nsprpub/pkg/solaris/proto64.mk +++ b/nspr/pkg/solaris/proto64.mk @@ -6,7 +6,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -#ident "$Id: proto64.mk,v 1.4 2012/03/06 13:13:40 gerv%gerv.net Exp $" +#ident "$Id$" # ifeq ($(USE_64), 1) diff --git a/mozilla/nsprpub/pr/src/misc/.cvsignore b/nspr/pr/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/misc/.cvsignore rename to nspr/pr/.cvsignore diff --git a/mozilla/nsprpub/pr/Makefile.in b/nspr/pr/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/Makefile.in rename to nspr/pr/Makefile.in diff --git a/mozilla/nsprpub/pr/src/memory/.cvsignore b/nspr/pr/include/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/memory/.cvsignore rename to nspr/pr/include/.cvsignore diff --git a/mozilla/nsprpub/pr/include/Makefile.in b/nspr/pr/include/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/include/Makefile.in rename to nspr/pr/include/Makefile.in diff --git a/mozilla/nsprpub/pr/include/gencfg.c b/nspr/pr/include/gencfg.c similarity index 95% rename from mozilla/nsprpub/pr/include/gencfg.c rename to nspr/pr/include/gencfg.c index ca4ee85..54c07ba 100644 --- a/mozilla/nsprpub/pr/include/gencfg.c +++ b/nspr/pr/include/gencfg.c @@ -12,15 +12,9 @@ #endif #if defined(__sun) -#if defined(__svr4) || defined(__svr4__) || defined(__SVR4) #ifndef SOLARIS error - SOLARIS is not defined #endif -#else -#ifndef SUNOS4 - error - SUNOS4 is not defined -#endif -#endif #endif #if defined(__hpux) @@ -70,12 +64,6 @@ #endif #endif -#if defined(__NeXT__) -#ifndef NEXTSTEP - error - NEXTSTEP is not defined -#endif -#endif - /************************************************************************/ /* Generate cpucfg.h */ @@ -87,7 +75,7 @@ #define INT64 long #endif #else -#if defined(HPUX) || defined(NECSVR4) || defined(SCO) || defined(UNIXWARE) || defined (NCR) +#if defined(HPUX) || defined(SCO) || defined(UNIXWARE) #define INT64 long #else #define INT64 long long diff --git a/mozilla/nsprpub/pr/src/md/windows/.cvsignore b/nspr/pr/include/md/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/.cvsignore rename to nspr/pr/include/md/.cvsignore diff --git a/mozilla/nsprpub/pr/include/md/Makefile.in b/nspr/pr/include/md/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/include/md/Makefile.in rename to nspr/pr/include/md/Makefile.in diff --git a/mozilla/nsprpub/pr/include/md/_aix.h b/nspr/pr/include/md/_aix.h similarity index 98% rename from mozilla/nsprpub/pr/include/md/_aix.h rename to nspr/pr/include/md/_aix.h index f65c00d..3daf14f 100644 --- a/mozilla/nsprpub/pr/include/md/_aix.h +++ b/nspr/pr/include/md/_aix.h @@ -55,6 +55,8 @@ /* Timer operations */ #if defined(AIX_TIMERS) +#define _MD_INTERVAL_INIT() + extern PRIntervalTime _MD_AixGetInterval(void); #define _MD_GET_INTERVAL _MD_AixGetInterval @@ -62,8 +64,7 @@ extern PRIntervalTime _MD_AixIntervalPerSec(void); #define _MD_INTERVAL_PER_SEC _MD_AixIntervalPerSec #else /* defined(AIX_TIMERS) */ -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #endif /* defined(AIX_TIMERS) */ #ifdef AIX_HAVE_ATOMIC_OP_H diff --git a/mozilla/nsprpub/pr/include/md/_aix32.cfg b/nspr/pr/include/md/_aix32.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_aix32.cfg rename to nspr/pr/include/md/_aix32.cfg diff --git a/mozilla/nsprpub/pr/include/md/_aix64.cfg b/nspr/pr/include/md/_aix64.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_aix64.cfg rename to nspr/pr/include/md/_aix64.cfg diff --git a/mozilla/nsprpub/pr/include/md/_beos.cfg b/nspr/pr/include/md/_beos.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_beos.cfg rename to nspr/pr/include/md/_beos.cfg diff --git a/mozilla/nsprpub/pr/include/md/_beos.h b/nspr/pr/include/md/_beos.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_beos.h rename to nspr/pr/include/md/_beos.h diff --git a/mozilla/nsprpub/pr/include/md/_bsdi.cfg b/nspr/pr/include/md/_bsdi.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_bsdi.cfg rename to nspr/pr/include/md/_bsdi.cfg diff --git a/mozilla/nsprpub/pr/include/md/_bsdi.h b/nspr/pr/include/md/_bsdi.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_bsdi.h rename to nspr/pr/include/md/_bsdi.h index 0e7b978..dbd0ec3 100644 --- a/mozilla/nsprpub/pr/include/md/_bsdi.h +++ b/nspr/pr/include/md/_bsdi.h @@ -176,7 +176,6 @@ struct _MDCPU { #include #define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #endif /* nspr_bsdi_defs_h___ */ diff --git a/mozilla/nsprpub/pr/include/md/_darwin.cfg b/nspr/pr/include/md/_darwin.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_darwin.cfg rename to nspr/pr/include/md/_darwin.cfg diff --git a/mozilla/nsprpub/pr/include/md/_darwin.h b/nspr/pr/include/md/_darwin.h similarity index 96% rename from mozilla/nsprpub/pr/include/md/_darwin.h rename to nspr/pr/include/md/_darwin.h index f398ddf..094d1c0 100644 --- a/mozilla/nsprpub/pr/include/md/_darwin.h +++ b/nspr/pr/include/md/_darwin.h @@ -280,12 +280,14 @@ extern void _MD_YIELD(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_INIT _PR_Mach_IntervalInit +#define _MD_GET_INTERVAL _PR_Mach_GetInterval +#define _MD_INTERVAL_PER_SEC _PR_Mach_TicksPerSecond extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); +extern void _PR_Mach_IntervalInit(void); +extern PRIntervalTime _PR_Mach_GetInterval(void); +extern PRIntervalTime _PR_Mach_TicksPerSecond(void); /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/mozilla/nsprpub/pr/include/md/_dgux.cfg b/nspr/pr/include/md/_dgux.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_dgux.cfg rename to nspr/pr/include/md/_dgux.cfg diff --git a/mozilla/nsprpub/pr/include/md/_dgux.h b/nspr/pr/include/md/_dgux.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_dgux.h rename to nspr/pr/include/md/_dgux.h index c7be819..66bf931 100644 --- a/mozilla/nsprpub/pr/include/md/_dgux.h +++ b/nspr/pr/include/md/_dgux.h @@ -158,8 +158,7 @@ struct _MDCPU { * 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 -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit diff --git a/mozilla/nsprpub/pr/include/md/_freebsd.cfg b/nspr/pr/include/md/_freebsd.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_freebsd.cfg rename to nspr/pr/include/md/_freebsd.cfg diff --git a/mozilla/nsprpub/pr/include/md/_freebsd.h b/nspr/pr/include/md/_freebsd.h similarity index 96% rename from mozilla/nsprpub/pr/include/md/_freebsd.h rename to nspr/pr/include/md/_freebsd.h index 553bda8..1ea7b60 100644 --- a/mozilla/nsprpub/pr/include/md/_freebsd.h +++ b/nspr/pr/include/md/_freebsd.h @@ -215,13 +215,10 @@ extern void _MD_YIELD(void); #endif /* ! _PR_PTHREADS */ extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/mozilla/nsprpub/pr/include/md/_hpux.h b/nspr/pr/include/md/_hpux.h similarity index 98% rename from mozilla/nsprpub/pr/include/md/_hpux.h rename to nspr/pr/include/md/_hpux.h index 7d5c204..ff5243d 100644 --- a/mozilla/nsprpub/pr/include/md/_hpux.h +++ b/nspr/pr/include/md/_hpux.h @@ -269,8 +269,7 @@ extern PRIntervalTime _PR_HPUX_LW_GetInterval(void); #define _MD_GET_INTERVAL _PR_HPUX_LW_GetInterval #define _MD_INTERVAL_PER_SEC() 1000 #else -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #endif /* diff --git a/mozilla/nsprpub/pr/include/md/_hpux32.cfg b/nspr/pr/include/md/_hpux32.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_hpux32.cfg rename to nspr/pr/include/md/_hpux32.cfg diff --git a/mozilla/nsprpub/pr/include/md/_hpux64.cfg b/nspr/pr/include/md/_hpux64.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_hpux64.cfg rename to nspr/pr/include/md/_hpux64.cfg diff --git a/mozilla/nsprpub/pr/include/md/_irix.h b/nspr/pr/include/md/_irix.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_irix.h rename to nspr/pr/include/md/_irix.h diff --git a/mozilla/nsprpub/pr/include/md/_irix32.cfg b/nspr/pr/include/md/_irix32.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_irix32.cfg rename to nspr/pr/include/md/_irix32.cfg diff --git a/mozilla/nsprpub/pr/include/md/_irix64.cfg b/nspr/pr/include/md/_irix64.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_irix64.cfg rename to nspr/pr/include/md/_irix64.cfg diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/nspr/pr/include/md/_linux.cfg similarity index 90% rename from mozilla/nsprpub/pr/include/md/_linux.cfg rename to nspr/pr/include/md/_linux.cfg index 3597d7a..2fdbf63 100644 --- a/mozilla/nsprpub/pr/include/md/_linux.cfg +++ b/nspr/pr/include/md/_linux.cfg @@ -212,6 +212,53 @@ #elif defined(__x86_64__) +#ifdef __ILP32__ + +#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 + #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN #define IS_64 @@ -256,6 +303,8 @@ #define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 +#endif + #elif defined(__mc68000__) #undef IS_LITTLE_ENDIAN @@ -541,6 +590,59 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 +#elif defined(__aarch64__) + +#ifdef __AARCH64EB__ +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 +#elif defined(__AARCH64EL__) +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else +#error "Unknown Aarch64 endianness." +#endif +#define IS_64 + +#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 8 +#define PR_BYTES_PER_FLOAT 4 +#define PR_BYTES_PER_DOUBLE 8 +#define PR_BYTES_PER_WORD 8 +#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 64 +#define PR_BITS_PER_FLOAT 32 +#define PR_BITS_PER_DOUBLE 64 +#define PR_BITS_PER_WORD 64 + +#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 6 +#define PR_BITS_PER_FLOAT_LOG2 5 +#define PR_BITS_PER_DOUBLE_LOG2 6 +#define PR_BITS_PER_WORD_LOG2 6 + +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 8 +#define PR_ALIGN_OF_INT64 8 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 +#define PR_ALIGN_OF_WORD 8 + +#define PR_BYTES_PER_WORD_LOG2 3 +#define PR_BYTES_PER_DWORD_LOG2 3 + #elif defined(__hppa__) #undef IS_LITTLE_ENDIAN diff --git a/mozilla/nsprpub/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h similarity index 98% rename from mozilla/nsprpub/pr/include/md/_linux.h rename to nspr/pr/include/md/_linux.h index f9e9016..906822f 100644 --- a/mozilla/nsprpub/pr/include/md/_linux.h +++ b/nspr/pr/include/md/_linux.h @@ -41,6 +41,8 @@ #define _PR_SI_ARCHITECTURE "mips" #elif defined(__arm__) #define _PR_SI_ARCHITECTURE "arm" +#elif defined(__aarch64__) +#define _PR_SI_ARCHITECTURE "aarch64" #elif defined(__hppa__) #define _PR_SI_ARCHITECTURE "hppa" #elif defined(__s390x__) @@ -63,6 +65,10 @@ #define _MD_DEFAULT_STACK_SIZE 65536L #define _MD_MMAP_FLAGS MAP_PRIVATE +#if defined(__aarch64__) +#define _MD_MINIMUM_STACK_SIZE 0x20000 +#endif + #undef HAVE_STACK_GROWING_UP /* @@ -186,7 +192,7 @@ extern PRInt32 _PR_ppc_AtomicSet(PRInt32 *val, PRInt32 newval); }) #endif -#if defined(__arm__) +#if defined(__arm__) || defined(__aarch64__) #if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) /* Use GCC built-in functions */ #define _PR_HAVE_ATOMIC_OPS @@ -626,13 +632,10 @@ extern void _MD_YIELD(void); #endif /* ! _PR_PTHREADS */ extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define HAVE_CLOCK_MONOTONIC /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/mozilla/nsprpub/pr/include/md/_netbsd.cfg b/nspr/pr/include/md/_netbsd.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_netbsd.cfg rename to nspr/pr/include/md/_netbsd.cfg diff --git a/mozilla/nsprpub/pr/include/md/_netbsd.h b/nspr/pr/include/md/_netbsd.h similarity index 96% rename from mozilla/nsprpub/pr/include/md/_netbsd.h rename to nspr/pr/include/md/_netbsd.h index c24acb2..8b8e8dd 100644 --- a/mozilla/nsprpub/pr/include/md/_netbsd.h +++ b/nspr/pr/include/md/_netbsd.h @@ -208,13 +208,10 @@ struct _MDCPU { #endif /* ! _PR_PTHREADS */ extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/mozilla/nsprpub/pr/include/md/_nspr_pthread.h b/nspr/pr/include/md/_nspr_pthread.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_nspr_pthread.h rename to nspr/pr/include/md/_nspr_pthread.h diff --git a/mozilla/nsprpub/pr/include/md/_nto.cfg b/nspr/pr/include/md/_nto.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_nto.cfg rename to nspr/pr/include/md/_nto.cfg diff --git a/mozilla/nsprpub/pr/include/md/_nto.h b/nspr/pr/include/md/_nto.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_nto.h rename to nspr/pr/include/md/_nto.h index a319ccf..9530975 100644 --- a/mozilla/nsprpub/pr/include/md/_nto.h +++ b/nspr/pr/include/md/_nto.h @@ -167,8 +167,7 @@ struct _MDCPU { #define _MD_IOQ_LOCK() #define _MD_IOQ_UNLOCK() -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit #define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) diff --git a/mozilla/nsprpub/pr/include/md/_openbsd.cfg b/nspr/pr/include/md/_openbsd.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_openbsd.cfg rename to nspr/pr/include/md/_openbsd.cfg diff --git a/mozilla/nsprpub/pr/include/md/_openbsd.h b/nspr/pr/include/md/_openbsd.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_openbsd.h rename to nspr/pr/include/md/_openbsd.h index 6873304..e014088 100644 --- a/mozilla/nsprpub/pr/include/md/_openbsd.h +++ b/nspr/pr/include/md/_openbsd.h @@ -192,8 +192,7 @@ struct _MDCPU { #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD /* * We wrapped the select() call. _MD_SELECT refers to the built-in, diff --git a/mozilla/nsprpub/pr/include/md/_os2.cfg b/nspr/pr/include/md/_os2.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_os2.cfg rename to nspr/pr/include/md/_os2.cfg diff --git a/mozilla/nsprpub/pr/include/md/_os2.h b/nspr/pr/include/md/_os2.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_os2.h rename to nspr/pr/include/md/_os2.h diff --git a/mozilla/nsprpub/pr/include/md/_os2_errors.h b/nspr/pr/include/md/_os2_errors.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_os2_errors.h rename to nspr/pr/include/md/_os2_errors.h diff --git a/mozilla/nsprpub/pr/include/md/_osf1.cfg b/nspr/pr/include/md/_osf1.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_osf1.cfg rename to nspr/pr/include/md/_osf1.cfg diff --git a/mozilla/nsprpub/pr/include/md/_osf1.h b/nspr/pr/include/md/_osf1.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_osf1.h rename to nspr/pr/include/md/_osf1.h index 6e85388..57445f7 100644 --- a/mozilla/nsprpub/pr/include/md/_osf1.h +++ b/nspr/pr/include/md/_osf1.h @@ -186,8 +186,7 @@ struct _MDCPU { * 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 -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit diff --git a/mozilla/nsprpub/pr/include/md/_pcos.h b/nspr/pr/include/md/_pcos.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_pcos.h rename to nspr/pr/include/md/_pcos.h diff --git a/mozilla/nsprpub/pr/include/md/_pth.h b/nspr/pr/include/md/_pth.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_pth.h rename to nspr/pr/include/md/_pth.h diff --git a/mozilla/nsprpub/pr/include/md/_qnx.cfg b/nspr/pr/include/md/_qnx.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_qnx.cfg rename to nspr/pr/include/md/_qnx.cfg diff --git a/mozilla/nsprpub/pr/include/md/_qnx.h b/nspr/pr/include/md/_qnx.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_qnx.h rename to nspr/pr/include/md/_qnx.h index a206d23..d3bba6d 100644 --- a/mozilla/nsprpub/pr/include/md/_qnx.h +++ b/nspr/pr/include/md/_qnx.h @@ -158,8 +158,7 @@ struct _MDCPU { #define _MD_IOQ_LOCK() #define _MD_IOQ_UNLOCK() -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit #define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) diff --git a/mozilla/nsprpub/pr/include/md/_riscos.cfg b/nspr/pr/include/md/_riscos.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_riscos.cfg rename to nspr/pr/include/md/_riscos.cfg diff --git a/mozilla/nsprpub/pr/include/md/_riscos.h b/nspr/pr/include/md/_riscos.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_riscos.h rename to nspr/pr/include/md/_riscos.h index 75f7b60..f62d668 100644 --- a/mozilla/nsprpub/pr/include/md/_riscos.h +++ b/nspr/pr/include/md/_riscos.h @@ -154,8 +154,7 @@ struct _MDCPU { #define _MD_IOQ_LOCK() #define _MD_IOQ_UNLOCK() -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit #define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) diff --git a/mozilla/nsprpub/pr/include/md/_scoos.cfg b/nspr/pr/include/md/_scoos.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_scoos.cfg rename to nspr/pr/include/md/_scoos.cfg diff --git a/mozilla/nsprpub/pr/include/md/_scoos.h b/nspr/pr/include/md/_scoos.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_scoos.h rename to nspr/pr/include/md/_scoos.h index 51b8e7f..c444dcd 100644 --- a/mozilla/nsprpub/pr/include/md/_scoos.h +++ b/nspr/pr/include/md/_scoos.h @@ -163,8 +163,7 @@ struct _MDCPU { #define _MD_RESUME_THREAD(thread) #define _MD_CLEAN_THREAD(_thread) -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_SELECT _select #define _MD_POLL _poll diff --git a/mozilla/nsprpub/pr/include/md/_solaris.cfg b/nspr/pr/include/md/_solaris.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_solaris.cfg rename to nspr/pr/include/md/_solaris.cfg diff --git a/mozilla/nsprpub/pr/include/md/_solaris.h b/nspr/pr/include/md/_solaris.h similarity index 98% rename from mozilla/nsprpub/pr/include/md/_solaris.h rename to nspr/pr/include/md/_solaris.h index da2143b..495ce4c 100644 --- a/mozilla/nsprpub/pr/include/md/_solaris.h +++ b/nspr/pr/include/md/_solaris.h @@ -110,6 +110,7 @@ struct _md_sockaddr_in6 { #endif #include "prinrval.h" +#define _MD_INTERVAL_INIT() NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void); #define _MD_GET_INTERVAL _MD_Solaris_GetInterval NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void); @@ -439,9 +440,7 @@ 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) @@ -467,11 +466,6 @@ extern PRStatus _MD_CREATE_THREAD(PRThread *thread, void (*start) (void *), PRThreadPriority priority, PRThreadScope scope, PRThreadState state, PRUint32 stackSize); -NSPR_API(PRIntervalTime) _MD_Solaris_GetInterval(void); -#define _MD_GET_INTERVAL _MD_Solaris_GetInterval -NSPR_API(PRIntervalTime) _MD_Solaris_TicksPerSecond(void); -#define _MD_INTERVAL_PER_SEC _MD_Solaris_TicksPerSecond - /* The following defines the unwrapped versions of select() and poll(). */ extern int _select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); diff --git a/mozilla/nsprpub/pr/include/md/_symbian.cfg b/nspr/pr/include/md/_symbian.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_symbian.cfg rename to nspr/pr/include/md/_symbian.cfg diff --git a/mozilla/nsprpub/pr/include/md/_symbian.h b/nspr/pr/include/md/_symbian.h similarity index 83% rename from mozilla/nsprpub/pr/include/md/_symbian.h rename to nspr/pr/include/md/_symbian.h index a0ccda0..f88bd38 100644 --- a/mozilla/nsprpub/pr/include/md/_symbian.h +++ b/nspr/pr/include/md/_symbian.h @@ -39,13 +39,10 @@ #endif extern void _MD_EarlyInit(void); -extern PRIntervalTime _PR_UNIX_GetInterval(void); -extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit -#define _MD_GET_INTERVAL _PR_UNIX_GetInterval -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD /* For writev() */ #include diff --git a/mozilla/nsprpub/pr/include/md/_unix_errors.h b/nspr/pr/include/md/_unix_errors.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_unix_errors.h rename to nspr/pr/include/md/_unix_errors.h diff --git a/mozilla/nsprpub/pr/include/md/_unixos.h b/nspr/pr/include/md/_unixos.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_unixos.h rename to nspr/pr/include/md/_unixos.h index 0e813f9..798d0b3 100644 --- a/mozilla/nsprpub/pr/include/md/_unixos.h +++ b/nspr/pr/include/md/_unixos.h @@ -15,7 +15,7 @@ * not be redefined. */ #if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \ - && !defined(DARWIN) && !defined(NEXTSTEP) + && !defined(DARWIN) #ifndef FD_SETSIZE #define FD_SETSIZE 4096 #endif @@ -147,7 +147,7 @@ extern void _MD_unix_init_running_cpu(struct _PRCPU *cpu); #define PROT_NONE 0x0 #endif -#if defined(DEBUG) && !defined(DARWIN) && !defined(NEXTSTEP) +#if defined(DEBUG) && !defined(DARWIN) #if !defined(SOLARIS) #include /* for memset() */ #define _MD_INIT_STACK(ts,REDZONE) \ @@ -294,9 +294,22 @@ extern void _MD_FreeSegment(PRSegment *seg); /************************************************************************/ -#if !defined(HPUX_LW_TIMER) +#ifdef _MD_INTERVAL_USE_GTOD +extern PRIntervalTime _PR_UNIX_GetInterval(void); +extern PRIntervalTime _PR_UNIX_TicksPerSecond(void); #define _MD_INTERVAL_INIT() +#define _MD_GET_INTERVAL _PR_UNIX_GetInterval +#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond #endif + +#ifdef HAVE_CLOCK_MONOTONIC +extern PRIntervalTime _PR_UNIX_GetInterval2(void); +extern PRIntervalTime _PR_UNIX_TicksPerSecond2(void); +#define _MD_INTERVAL_INIT() +#define _MD_GET_INTERVAL _PR_UNIX_GetInterval2 +#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond2 +#endif + #define _MD_INTERVAL_PER_MILLISEC() (_PR_MD_INTERVAL_PER_SEC() / 1000) #define _MD_INTERVAL_PER_MICROSEC() (_PR_MD_INTERVAL_PER_SEC() / 1000000) diff --git a/mozilla/nsprpub/pr/include/md/_unixware.cfg b/nspr/pr/include/md/_unixware.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_unixware.cfg rename to nspr/pr/include/md/_unixware.cfg diff --git a/mozilla/nsprpub/pr/include/md/_unixware.h b/nspr/pr/include/md/_unixware.h similarity index 97% rename from mozilla/nsprpub/pr/include/md/_unixware.h rename to nspr/pr/include/md/_unixware.h index 11cf7f9..ef76f5a 100644 --- a/mozilla/nsprpub/pr/include/md/_unixware.h +++ b/nspr/pr/include/md/_unixware.h @@ -158,8 +158,7 @@ struct _MDCPU { * 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 -#define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond +#define _MD_INTERVAL_USE_GTOD #define _MD_EARLY_INIT _MD_EarlyInit #define _MD_FINAL_INIT _PR_UnixInit diff --git a/mozilla/nsprpub/pr/include/md/_unixware7.cfg b/nspr/pr/include/md/_unixware7.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_unixware7.cfg rename to nspr/pr/include/md/_unixware7.cfg diff --git a/mozilla/nsprpub/pr/include/md/_win32_errors.h b/nspr/pr/include/md/_win32_errors.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_win32_errors.h rename to nspr/pr/include/md/_win32_errors.h diff --git a/mozilla/nsprpub/pr/include/md/_win95.cfg b/nspr/pr/include/md/_win95.cfg similarity index 98% rename from mozilla/nsprpub/pr/include/md/_win95.cfg rename to nspr/pr/include/md/_win95.cfg index 77d1828..1e693cc 100644 --- a/mozilla/nsprpub/pr/include/md/_win95.cfg +++ b/nspr/pr/include/md/_win95.cfg @@ -14,15 +14,9 @@ #define WIN32 #endif -#ifdef _WIN32_WCE -#ifndef WINCE -#define WINCE -#endif -#else #ifndef WIN95 #define WIN95 #endif -#endif #define PR_AF_INET6 23 /* same as AF_INET6 */ @@ -214,7 +208,7 @@ #define PR_ALIGN_OF_FLOAT 4 #define PR_ALIGN_OF_WORD 4 #define PR_ALIGN_OF_DWORD 8 -#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_DOUBLE 8 #define PR_ALIGN_OF_POINTER 4 #define PR_BYTES_PER_WORD_LOG2 2 diff --git a/mozilla/nsprpub/pr/include/md/_win95.h b/nspr/pr/include/md/_win95.h similarity index 98% rename from mozilla/nsprpub/pr/include/md/_win95.h rename to nspr/pr/include/md/_win95.h index a919e3a..b008c13 100644 --- a/mozilla/nsprpub/pr/include/md/_win95.h +++ b/nspr/pr/include/md/_win95.h @@ -246,7 +246,6 @@ extern PRInt32 _MD_CloseFile(PROsfd osfd); #define _MD_UNLOCKFILE _PR_MD_UNLOCKFILE /* --- UTF16 IO stuff --- */ -extern PRBool _pr_useUnicode; #ifdef MOZ_UNICODE #define _MD_OPEN_FILE_UTF16 _PR_MD_OPEN_FILE_UTF16 #define _MD_OPEN_DIR_UTF16 _PR_MD_OPEN_DIR_UTF16 @@ -379,9 +378,9 @@ extern PROsfd _MD_Accept(PRFileDesc *fd, PRNetAddr *raddr, PRUint32 *rlen, /* --- Lock stuff --- */ #define _PR_LOCK _MD_LOCK -#define _PR_UNLOCK _MD_UNLOCK +#define _PR_UNLOCK _MD_UNLOCK -#define _MD_NEW_LOCK(lock) (InitializeCriticalSection(&((lock)->mutex)),(lock)->notified.length=0,(lock)->notified.link=NULL,PR_SUCCESS) +#define _MD_NEW_LOCK _PR_MD_NEW_LOCK #define _MD_FREE_LOCK(lock) DeleteCriticalSection(&((lock)->mutex)) #define _MD_LOCK(lock) EnterCriticalSection(&((lock)->mutex)) #define _MD_TEST_AND_LOCK(lock) (EnterCriticalSection(&((lock)->mutex)),0) @@ -499,7 +498,7 @@ extern DWORD _pr_currentCPUIndex; #define _PR_UnlockSched() 0 /* --- Initialization stuff --- */ -#define _MD_INIT_LOCKS() +#define _MD_INIT_LOCKS _PR_MD_INIT_LOCKS /* --- Stack stuff --- */ #define _MD_INIT_STACK(stack, redzone) diff --git a/mozilla/nsprpub/pr/include/md/_winnt.cfg b/nspr/pr/include/md/_winnt.cfg similarity index 100% rename from mozilla/nsprpub/pr/include/md/_winnt.cfg rename to nspr/pr/include/md/_winnt.cfg diff --git a/mozilla/nsprpub/pr/include/md/_winnt.h b/nspr/pr/include/md/_winnt.h similarity index 100% rename from mozilla/nsprpub/pr/include/md/_winnt.h rename to nspr/pr/include/md/_winnt.h diff --git a/mozilla/nsprpub/pr/include/md/prosdep.h b/nspr/pr/include/md/prosdep.h similarity index 87% rename from mozilla/nsprpub/pr/include/md/prosdep.h rename to nspr/pr/include/md/prosdep.h index 389538c..94d8945 100644 --- a/mozilla/nsprpub/pr/include/md/prosdep.h +++ b/nspr/pr/include/md/prosdep.h @@ -61,33 +61,15 @@ PR_BEGIN_EXTERN_C #elif defined(DARWIN) #include "md/_darwin.h" -#elif defined(NEXTSTEP) -#include "md/_nextstep.h" - #elif defined(SOLARIS) #include "md/_solaris.h" -#elif defined(SUNOS4) -#include "md/_sunos4.h" - -#elif defined(SNI) -#include "md/_reliantunix.h" - -#elif defined(SONY) -#include "md/_sony.h" - -#elif defined(NEC) -#include "md/_nec.h" - #elif defined(SCO) #include "md/_scoos.h" #elif defined(UNIXWARE) #include "md/_unixware.h" -#elif defined(NCR) -#include "md/_ncr.h" - #elif defined(DGUX) #include "md/_dgux.h" diff --git a/mozilla/nsprpub/pr/include/nspr.h b/nspr/pr/include/nspr.h similarity index 100% rename from mozilla/nsprpub/pr/include/nspr.h rename to nspr/pr/include/nspr.h diff --git a/mozilla/nsprpub/pr/src/md/unix/.cvsignore b/nspr/pr/include/obsolete/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/.cvsignore rename to nspr/pr/include/obsolete/.cvsignore diff --git a/mozilla/nsprpub/pr/include/obsolete/Makefile.in b/nspr/pr/include/obsolete/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/Makefile.in rename to nspr/pr/include/obsolete/Makefile.in diff --git a/mozilla/nsprpub/pr/include/obsolete/pralarm.h b/nspr/pr/include/obsolete/pralarm.h similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/pralarm.h rename to nspr/pr/include/obsolete/pralarm.h diff --git a/mozilla/nsprpub/pr/include/obsolete/probslet.h b/nspr/pr/include/obsolete/probslet.h similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/probslet.h rename to nspr/pr/include/obsolete/probslet.h diff --git a/mozilla/nsprpub/pr/include/obsolete/protypes.h b/nspr/pr/include/obsolete/protypes.h similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/protypes.h rename to nspr/pr/include/obsolete/protypes.h diff --git a/mozilla/nsprpub/pr/include/obsolete/prsem.h b/nspr/pr/include/obsolete/prsem.h similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/prsem.h rename to nspr/pr/include/obsolete/prsem.h diff --git a/mozilla/nsprpub/pr/include/pratom.h b/nspr/pr/include/pratom.h similarity index 100% rename from mozilla/nsprpub/pr/include/pratom.h rename to nspr/pr/include/pratom.h diff --git a/mozilla/nsprpub/pr/include/prbit.h b/nspr/pr/include/prbit.h similarity index 95% rename from mozilla/nsprpub/pr/include/prbit.h rename to nspr/pr/include/prbit.h index f0a51d0..de83750 100644 --- a/mozilla/nsprpub/pr/include/prbit.h +++ b/nspr/pr/include/prbit.h @@ -9,8 +9,12 @@ #include "prtypes.h" PR_BEGIN_EXTERN_C -/* replace compare/jump/add/shift sequence with x86 BSF/BSR instruction */ -#if defined(_WIN32) && (_MSC_VER >= 1300) && (defined(_M_IX86) || defined(_M_AMD64)) +/* +** Replace compare/jump/add/shift sequence with compiler built-in/intrinsic +** functions. +*/ +#if defined(_WIN32) && (_MSC_VER >= 1300) && \ + (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)) unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask); unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask); # pragma intrinsic(_BitScanForward,_BitScanReverse) @@ -133,7 +137,7 @@ NSPR_API(PRIntn) PR_FloorLog2(PRUint32 i); */ #if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || \ - defined(_M_X64)) + defined(_M_X64) || defined(_M_ARM)) #include #pragma intrinsic(_rotl, _rotr) #define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits) diff --git a/mozilla/nsprpub/pr/include/prclist.h b/nspr/pr/include/prclist.h similarity index 100% rename from mozilla/nsprpub/pr/include/prclist.h rename to nspr/pr/include/prclist.h diff --git a/mozilla/nsprpub/pr/include/prcmon.h b/nspr/pr/include/prcmon.h similarity index 100% rename from mozilla/nsprpub/pr/include/prcmon.h rename to nspr/pr/include/prcmon.h diff --git a/mozilla/nsprpub/pr/include/prcountr.h b/nspr/pr/include/prcountr.h similarity index 100% rename from mozilla/nsprpub/pr/include/prcountr.h rename to nspr/pr/include/prcountr.h diff --git a/mozilla/nsprpub/pr/include/prcvar.h b/nspr/pr/include/prcvar.h similarity index 100% rename from mozilla/nsprpub/pr/include/prcvar.h rename to nspr/pr/include/prcvar.h diff --git a/mozilla/nsprpub/pr/include/prdtoa.h b/nspr/pr/include/prdtoa.h similarity index 100% rename from mozilla/nsprpub/pr/include/prdtoa.h rename to nspr/pr/include/prdtoa.h diff --git a/mozilla/nsprpub/pr/include/prenv.h b/nspr/pr/include/prenv.h similarity index 100% rename from mozilla/nsprpub/pr/include/prenv.h rename to nspr/pr/include/prenv.h diff --git a/mozilla/nsprpub/pr/include/prerr.h b/nspr/pr/include/prerr.h similarity index 100% rename from mozilla/nsprpub/pr/include/prerr.h rename to nspr/pr/include/prerr.h diff --git a/mozilla/nsprpub/pr/include/prerror.h b/nspr/pr/include/prerror.h similarity index 100% rename from mozilla/nsprpub/pr/include/prerror.h rename to nspr/pr/include/prerror.h diff --git a/mozilla/nsprpub/pr/include/prinet.h b/nspr/pr/include/prinet.h similarity index 100% rename from mozilla/nsprpub/pr/include/prinet.h rename to nspr/pr/include/prinet.h diff --git a/mozilla/nsprpub/pr/include/prinit.h b/nspr/pr/include/prinit.h similarity index 98% rename from mozilla/nsprpub/pr/include/prinit.h rename to nspr/pr/include/prinit.h index ee631bf..c73b509 100644 --- a/mozilla/nsprpub/pr/include/prinit.h +++ b/nspr/pr/include/prinit.h @@ -31,10 +31,10 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.9.2" +#define PR_VERSION "4.10" #define PR_VMAJOR 4 -#define PR_VMINOR 9 -#define PR_VPATCH 2 +#define PR_VMINOR 10 +#define PR_VPATCH 0 #define PR_BETA PR_FALSE /* diff --git a/mozilla/nsprpub/pr/include/prinrval.h b/nspr/pr/include/prinrval.h similarity index 100% rename from mozilla/nsprpub/pr/include/prinrval.h rename to nspr/pr/include/prinrval.h diff --git a/mozilla/nsprpub/pr/include/prio.h b/nspr/pr/include/prio.h similarity index 100% rename from mozilla/nsprpub/pr/include/prio.h rename to nspr/pr/include/prio.h diff --git a/mozilla/nsprpub/pr/include/pripcsem.h b/nspr/pr/include/pripcsem.h similarity index 100% rename from mozilla/nsprpub/pr/include/pripcsem.h rename to nspr/pr/include/pripcsem.h diff --git a/mozilla/nsprpub/pr/src/md/os2/.cvsignore b/nspr/pr/include/private/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/.cvsignore rename to nspr/pr/include/private/.cvsignore diff --git a/mozilla/nsprpub/pr/include/private/Makefile.in b/nspr/pr/include/private/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/include/private/Makefile.in rename to nspr/pr/include/private/Makefile.in diff --git a/mozilla/nsprpub/pr/include/private/pprio.h b/nspr/pr/include/private/pprio.h similarity index 100% rename from mozilla/nsprpub/pr/include/private/pprio.h rename to nspr/pr/include/private/pprio.h diff --git a/mozilla/nsprpub/pr/include/private/pprmwait.h b/nspr/pr/include/private/pprmwait.h similarity index 100% rename from mozilla/nsprpub/pr/include/private/pprmwait.h rename to nspr/pr/include/private/pprmwait.h diff --git a/mozilla/nsprpub/pr/include/private/pprthred.h b/nspr/pr/include/private/pprthred.h similarity index 100% rename from mozilla/nsprpub/pr/include/private/pprthred.h rename to nspr/pr/include/private/pprthred.h diff --git a/mozilla/nsprpub/pr/include/private/primpl.h b/nspr/pr/include/private/primpl.h similarity index 99% rename from mozilla/nsprpub/pr/include/private/primpl.h rename to nspr/pr/include/private/primpl.h index e9217f2..5b5469c 100644 --- a/mozilla/nsprpub/pr/include/private/primpl.h +++ b/nspr/pr/include/private/primpl.h @@ -50,6 +50,10 @@ typedef struct PRSegment PRSegment; #include #endif +#ifdef HAVE_SYSCALL +#include +#endif + /************************************************************************* ***** A Word about Model Dependent Function Naming Convention *********** *************************************************************************/ @@ -186,6 +190,17 @@ typedef struct PTDebug NSPR_API(void) PT_FPrintStats(PRFileDesc *fd, const char *msg); +/* + * On Linux and its derivatives POSIX priority scheduling works only for + * real-time threads. On those platforms we set thread's nice values + * instead which requires us to track kernel thread IDs for each POSIX + * thread we create. + */ +#if defined(LINUX) && defined(HAVE_SETPRIORITY) && \ + ((defined(HAVE_SYSCALL) && defined(SYS_gettid)) || defined(HAVE_GETTID)) +#define _PR_NICE_PRIORITY_SCHEDULING +#endif + #else /* defined(_PR_PTHREADS) */ NSPR_API(void) PT_FPrintStats(PRFileDesc *fd, const char *msg); @@ -1540,6 +1555,9 @@ struct PRThread { #if defined(_PR_PTHREADS) pthread_t id; /* pthread identifier for the thread */ +#ifdef _PR_NICE_PRIORITY_SCHEDULING + pid_t tid; /* Linux-specific kernel thread ID */ +#endif PRBool okToDelete; /* ok to delete the PRThread struct? */ PRCondVar *waiting; /* where the thread is waiting | NULL */ void *sp; /* recorded sp for garbage collection */ @@ -1826,7 +1844,6 @@ extern void _PR_DestroyZones(void); && !defined(_PR_PTHREADS) && !defined(_PR_GLOBAL_THREADS_ONLY) \ && !defined(PURIFY) \ && !defined(DARWIN) \ - && !defined(NEXTSTEP) \ && !defined(QNX) \ && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS)) #define _PR_OVERRIDE_MALLOC diff --git a/mozilla/nsprpub/pr/include/private/prpriv.h b/nspr/pr/include/private/prpriv.h similarity index 100% rename from mozilla/nsprpub/pr/include/private/prpriv.h rename to nspr/pr/include/private/prpriv.h diff --git a/mozilla/nsprpub/pr/include/prlink.h b/nspr/pr/include/prlink.h similarity index 100% rename from mozilla/nsprpub/pr/include/prlink.h rename to nspr/pr/include/prlink.h diff --git a/mozilla/nsprpub/pr/include/prlock.h b/nspr/pr/include/prlock.h similarity index 100% rename from mozilla/nsprpub/pr/include/prlock.h rename to nspr/pr/include/prlock.h diff --git a/mozilla/nsprpub/pr/include/prlog.h b/nspr/pr/include/prlog.h similarity index 100% rename from mozilla/nsprpub/pr/include/prlog.h rename to nspr/pr/include/prlog.h diff --git a/mozilla/nsprpub/pr/include/prlong.h b/nspr/pr/include/prlong.h similarity index 99% rename from mozilla/nsprpub/pr/include/prlong.h rename to nspr/pr/include/prlong.h index 23bd3a9..df1f30b 100644 --- a/mozilla/nsprpub/pr/include/prlong.h +++ b/nspr/pr/include/prlong.h @@ -35,7 +35,7 @@ NSPR_API(PRUint64) LL_MaxUint(void); #if defined(HAVE_LONG_LONG) /* Keep this in sync with prtypes.h. */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) #define LL_MAXINT 9223372036854775807L #define LL_MININT (-LL_MAXINT - 1L) #define LL_ZERO 0L diff --git a/mozilla/nsprpub/pr/include/prmem.h b/nspr/pr/include/prmem.h similarity index 100% rename from mozilla/nsprpub/pr/include/prmem.h rename to nspr/pr/include/prmem.h diff --git a/mozilla/nsprpub/pr/include/prmon.h b/nspr/pr/include/prmon.h similarity index 100% rename from mozilla/nsprpub/pr/include/prmon.h rename to nspr/pr/include/prmon.h diff --git a/mozilla/nsprpub/pr/include/prmwait.h b/nspr/pr/include/prmwait.h similarity index 100% rename from mozilla/nsprpub/pr/include/prmwait.h rename to nspr/pr/include/prmwait.h diff --git a/mozilla/nsprpub/pr/include/prnetdb.h b/nspr/pr/include/prnetdb.h similarity index 100% rename from mozilla/nsprpub/pr/include/prnetdb.h rename to nspr/pr/include/prnetdb.h diff --git a/mozilla/nsprpub/pr/include/prolock.h b/nspr/pr/include/prolock.h similarity index 100% rename from mozilla/nsprpub/pr/include/prolock.h rename to nspr/pr/include/prolock.h diff --git a/mozilla/nsprpub/pr/include/prpdce.h b/nspr/pr/include/prpdce.h similarity index 100% rename from mozilla/nsprpub/pr/include/prpdce.h rename to nspr/pr/include/prpdce.h diff --git a/mozilla/nsprpub/pr/include/prprf.h b/nspr/pr/include/prprf.h similarity index 100% rename from mozilla/nsprpub/pr/include/prprf.h rename to nspr/pr/include/prprf.h diff --git a/mozilla/nsprpub/pr/include/prproces.h b/nspr/pr/include/prproces.h similarity index 100% rename from mozilla/nsprpub/pr/include/prproces.h rename to nspr/pr/include/prproces.h diff --git a/mozilla/nsprpub/pr/include/prrng.h b/nspr/pr/include/prrng.h similarity index 100% rename from mozilla/nsprpub/pr/include/prrng.h rename to nspr/pr/include/prrng.h diff --git a/mozilla/nsprpub/pr/include/prrwlock.h b/nspr/pr/include/prrwlock.h similarity index 100% rename from mozilla/nsprpub/pr/include/prrwlock.h rename to nspr/pr/include/prrwlock.h diff --git a/mozilla/nsprpub/pr/include/prshm.h b/nspr/pr/include/prshm.h similarity index 100% rename from mozilla/nsprpub/pr/include/prshm.h rename to nspr/pr/include/prshm.h diff --git a/mozilla/nsprpub/pr/include/prshma.h b/nspr/pr/include/prshma.h similarity index 100% rename from mozilla/nsprpub/pr/include/prshma.h rename to nspr/pr/include/prshma.h diff --git a/mozilla/nsprpub/pr/include/prsystem.h b/nspr/pr/include/prsystem.h similarity index 100% rename from mozilla/nsprpub/pr/include/prsystem.h rename to nspr/pr/include/prsystem.h diff --git a/mozilla/nsprpub/pr/include/prthread.h b/nspr/pr/include/prthread.h similarity index 96% rename from mozilla/nsprpub/pr/include/prthread.h rename to nspr/pr/include/prthread.h index 708c889..f8b28a6 100644 --- a/mozilla/nsprpub/pr/include/prthread.h +++ b/nspr/pr/include/prthread.h @@ -141,6 +141,13 @@ NSPR_API(PRThreadPriority) PR_GetThreadPriority(const PRThread *thread); /* ** Change the priority of the "thread" to "priority". +** +** PR_SetThreadPriority works in a best-effort manner. On some platforms a +** special privilege, such as root access, is required to change thread +** priorities, especially to raise thread priorities. If the caller doesn't +** have enough privileges to change thread priorites, the function has no +** effect except causing a future PR_GetThreadPriority call to return +** |priority|. */ NSPR_API(void) PR_SetThreadPriority(PRThread *thread, PRThreadPriority priority); diff --git a/mozilla/nsprpub/pr/include/prtime.h b/nspr/pr/include/prtime.h similarity index 95% rename from mozilla/nsprpub/pr/include/prtime.h rename to nspr/pr/include/prtime.h index fb5be8e..732990e 100644 --- a/mozilla/nsprpub/pr/include/prtime.h +++ b/nspr/pr/include/prtime.h @@ -246,17 +246,6 @@ NSPR_API(PRStatus) PR_ParseTimeString ( PRBool default_to_gmt, PRTime *result); -/* - * FIXME: should we also have a formatting function, such as asctime, ctime, - * and strftime in standard C library? But this would involve - * internationalization issues. Might want to provide a US English version. - */ - -/**********************************************************************/ -/*********************** OLD COMPATIBILITYFUNCTIONS *******************/ -/**********************************************************************/ -#ifndef NO_NSPR_10_SUPPORT - /* Format a time value into a buffer. Same semantics as strftime() */ NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm); @@ -268,8 +257,6 @@ NSPR_API(PRUint32) PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize, const char* format, const PRExplodedTime* tm ); -#endif /* NO_NSPR_10_SUPPORT */ - PR_END_EXTERN_C #endif /* prtime_h___ */ diff --git a/mozilla/nsprpub/pr/include/prtpool.h b/nspr/pr/include/prtpool.h similarity index 100% rename from mozilla/nsprpub/pr/include/prtpool.h rename to nspr/pr/include/prtpool.h diff --git a/mozilla/nsprpub/pr/include/prtrace.h b/nspr/pr/include/prtrace.h similarity index 100% rename from mozilla/nsprpub/pr/include/prtrace.h rename to nspr/pr/include/prtrace.h diff --git a/mozilla/nsprpub/pr/include/prtypes.h b/nspr/pr/include/prtypes.h similarity index 92% rename from mozilla/nsprpub/pr/include/prtypes.h rename to nspr/pr/include/prtypes.h index 56fa039..a5069bb 100644 --- a/mozilla/nsprpub/pr/include/prtypes.h +++ b/nspr/pr/include/prtypes.h @@ -205,6 +205,36 @@ PR_BEGIN_EXTERN_C +/* +** Starting in NSPR 4.9.5, NSPR's exact-width integer types should match +** the exact-width integer types defined in . This allows sloppy +** code to use PRInt{N} and int{N}_t interchangeably. +** +** The 8-bit and 16-bit integer types can only be defined using char and +** short. All platforms define the 32-bit integer types using int. So only +** the 64-bit integer types could be defined differently. +** +** NSPR's original strategy was to use the "shortest" 64-bit integer type: +** if long is 64-bit, then prefer it over long long. This strategy is also +** used by Linux/glibc, FreeBSD, and NetBSD. +** +** Other platforms use a different strategy: simply define the 64-bit +** integer types using long long. We define the PR_ALTERNATE_INT64_TYPEDEF +** macro on these platforms. Note that PR_ALTERNATE_INT64_TYPEDEF is for +** internal use by NSPR headers only. Do not define or test this macro in +** your code. +** +** NOTE: NSPR can't use because C99 requires C++ code to define +** __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS to make all the macros +** defined in available. This strange requirement is gone in +** C11. When most platforms ignore this C99 requirement, NSPR will be able +** to use . A patch to do that is in NSPR bug 634793. +*/ + +#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__) +#define PR_ALTERNATE_INT64_TYPEDEF +#endif + /************************************************************************ ** TYPES: PRUint8 ** PRInt8 @@ -331,12 +361,7 @@ typedef long PRInt32; ************************************************************************/ #ifdef HAVE_LONG_LONG /* Keep this in sync with prlong.h. */ -/* - * On 64-bit Mac OS X, uint64 needs to be defined as unsigned long long to - * match uint64_t, otherwise our uint64 typedef conflicts with the uint64 - * typedef in cssmconfig.h, which CoreServices.h includes indirectly. - */ -#if PR_BYTES_PER_LONG == 8 && !defined(__APPLE__) +#if PR_BYTES_PER_LONG == 8 && !defined(PR_ALTERNATE_INT64_TYPEDEF) typedef long PRInt64; typedef unsigned long PRUint64; #define PR_INT64(x) x ## L diff --git a/mozilla/nsprpub/pr/include/prvrsion.h b/nspr/pr/include/prvrsion.h similarity index 100% rename from mozilla/nsprpub/pr/include/prvrsion.h rename to nspr/pr/include/prvrsion.h diff --git a/mozilla/nsprpub/pr/include/prwin16.h b/nspr/pr/include/prwin16.h similarity index 100% rename from mozilla/nsprpub/pr/include/prwin16.h rename to nspr/pr/include/prwin16.h diff --git a/mozilla/nsprpub/pr/src/.cvsignore b/nspr/pr/src/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/.cvsignore rename to nspr/pr/src/.cvsignore diff --git a/mozilla/nsprpub/pr/src/Makefile.in b/nspr/pr/src/Makefile.in similarity index 97% rename from mozilla/nsprpub/pr/src/Makefile.in rename to nspr/pr/src/Makefile.in index 60445c7..dfe1b50 100644 --- a/mozilla/nsprpub/pr/src/Makefile.in +++ b/nspr/pr/src/Makefile.in @@ -33,9 +33,6 @@ endif # ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OS_LIBS = -lm -else # 4.1.3_U1 MAPFILE = $(OBJDIR)/nsprmap.sun GARBAGE += $(MAPFILE) ifdef NS_USE_GCC @@ -67,7 +64,6 @@ ifndef USE_64 DSO_LDOPTS += -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so endif endif # sparc -endif # 4.1.3_U1 endif # SunOS ifeq ($(OS_ARCH), IRIX) @@ -122,7 +118,8 @@ OS_LIBS += -lc_r endif endif -ifeq ($(OS_ARCH),Linux) +# Linux, GNU/Hurd, and GNU/kFreeBSD systems +ifneq (,$(filter Linux GNU%,$(OS_ARCH))) ifeq ($(USE_PTHREADS), 1) ifeq ($(OS_TARGET),Android) # Android has no libpthread.so in NDK @@ -133,6 +130,10 @@ endif else OS_LIBS = -ldl endif +ifneq ($(OS_TARGET),Android) +# Android has no librt - realtime functions are in libc +OS_LIBS += -lrt +endif endif ifeq ($(OS_ARCH),HP-UX) @@ -162,10 +163,6 @@ ifeq ($(OS_ARCH),UNIXWARE) OS_LIBS = -lsocket -lc endif -ifeq ($(OS_ARCH),NEWS-OS) -OS_LIBS = -lsocket -lnsl -lgen -lresolv -endif - ifeq ($(OS_ARCH),WINNT) ifdef NS_USE_GCC OS_LIBS = -ladvapi32 -lwsock32 -lwinmm diff --git a/mozilla/nsprpub/pr/src/md/beos/.cvsignore b/nspr/pr/src/bthreads/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/.cvsignore rename to nspr/pr/src/bthreads/.cvsignore diff --git a/mozilla/nsprpub/pr/src/bthreads/Makefile.in b/nspr/pr/src/bthreads/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/Makefile.in rename to nspr/pr/src/bthreads/Makefile.in diff --git a/mozilla/nsprpub/pr/src/bthreads/bsrcs.mk b/nspr/pr/src/bthreads/bsrcs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/bsrcs.mk rename to nspr/pr/src/bthreads/bsrcs.mk diff --git a/mozilla/nsprpub/pr/src/bthreads/btcvar.c b/nspr/pr/src/bthreads/btcvar.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btcvar.c rename to nspr/pr/src/bthreads/btcvar.c diff --git a/mozilla/nsprpub/pr/src/bthreads/btlocks.c b/nspr/pr/src/bthreads/btlocks.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btlocks.c rename to nspr/pr/src/bthreads/btlocks.c diff --git a/mozilla/nsprpub/pr/src/bthreads/btmisc.c b/nspr/pr/src/bthreads/btmisc.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btmisc.c rename to nspr/pr/src/bthreads/btmisc.c diff --git a/mozilla/nsprpub/pr/src/bthreads/btmon.c b/nspr/pr/src/bthreads/btmon.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btmon.c rename to nspr/pr/src/bthreads/btmon.c diff --git a/mozilla/nsprpub/pr/src/bthreads/btsem.c b/nspr/pr/src/bthreads/btsem.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btsem.c rename to nspr/pr/src/bthreads/btsem.c diff --git a/mozilla/nsprpub/pr/src/bthreads/btthread.c b/nspr/pr/src/bthreads/btthread.c similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/btthread.c rename to nspr/pr/src/bthreads/btthread.c diff --git a/mozilla/nsprpub/pr/src/bthreads/objs.mk b/nspr/pr/src/bthreads/objs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/objs.mk rename to nspr/pr/src/bthreads/objs.mk diff --git a/mozilla/nsprpub/pr/src/md/.cvsignore b/nspr/pr/src/cplus/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/md/.cvsignore rename to nspr/pr/src/cplus/.cvsignore diff --git a/mozilla/nsprpub/pr/src/cplus/Makefile.in b/nspr/pr/src/cplus/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/Makefile.in rename to nspr/pr/src/cplus/Makefile.in diff --git a/mozilla/nsprpub/pr/src/cplus/rcascii.h b/nspr/pr/src/cplus/rcascii.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcascii.h rename to nspr/pr/src/cplus/rcascii.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcbase.cpp b/nspr/pr/src/cplus/rcbase.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcbase.cpp rename to nspr/pr/src/cplus/rcbase.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcbase.h b/nspr/pr/src/cplus/rcbase.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcbase.h rename to nspr/pr/src/cplus/rcbase.h diff --git a/mozilla/nsprpub/pr/src/cplus/rccv.cpp b/nspr/pr/src/cplus/rccv.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rccv.cpp rename to nspr/pr/src/cplus/rccv.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rccv.h b/nspr/pr/src/cplus/rccv.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rccv.h rename to nspr/pr/src/cplus/rccv.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcfileio.cpp b/nspr/pr/src/cplus/rcfileio.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcfileio.cpp rename to nspr/pr/src/cplus/rcfileio.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcfileio.h b/nspr/pr/src/cplus/rcfileio.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcfileio.h rename to nspr/pr/src/cplus/rcfileio.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcinrval.cpp b/nspr/pr/src/cplus/rcinrval.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcinrval.cpp rename to nspr/pr/src/cplus/rcinrval.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcinrval.h b/nspr/pr/src/cplus/rcinrval.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcinrval.h rename to nspr/pr/src/cplus/rcinrval.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcio.cpp b/nspr/pr/src/cplus/rcio.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcio.cpp rename to nspr/pr/src/cplus/rcio.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcio.h b/nspr/pr/src/cplus/rcio.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcio.h rename to nspr/pr/src/cplus/rcio.h diff --git a/mozilla/nsprpub/pr/src/cplus/rclock.cpp b/nspr/pr/src/cplus/rclock.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rclock.cpp rename to nspr/pr/src/cplus/rclock.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rclock.h b/nspr/pr/src/cplus/rclock.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rclock.h rename to nspr/pr/src/cplus/rclock.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcmon.h b/nspr/pr/src/cplus/rcmon.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcmon.h rename to nspr/pr/src/cplus/rcmon.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcnetdb.cpp b/nspr/pr/src/cplus/rcnetdb.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcnetdb.cpp rename to nspr/pr/src/cplus/rcnetdb.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcnetdb.h b/nspr/pr/src/cplus/rcnetdb.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcnetdb.h rename to nspr/pr/src/cplus/rcnetdb.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcnetio.cpp b/nspr/pr/src/cplus/rcnetio.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcnetio.cpp rename to nspr/pr/src/cplus/rcnetio.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcnetio.h b/nspr/pr/src/cplus/rcnetio.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcnetio.h rename to nspr/pr/src/cplus/rcnetio.h diff --git a/mozilla/nsprpub/pr/src/cplus/rcthread.cpp b/nspr/pr/src/cplus/rcthread.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcthread.cpp rename to nspr/pr/src/cplus/rcthread.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rcthread.h b/nspr/pr/src/cplus/rcthread.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rcthread.h rename to nspr/pr/src/cplus/rcthread.h diff --git a/mozilla/nsprpub/pr/src/cplus/rctime.cpp b/nspr/pr/src/cplus/rctime.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rctime.cpp rename to nspr/pr/src/cplus/rctime.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/rctime.h b/nspr/pr/src/cplus/rctime.h similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/rctime.h rename to nspr/pr/src/cplus/rctime.h diff --git a/mozilla/nsprpub/pr/src/malloc/.cvsignore b/nspr/pr/src/cplus/tests/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/malloc/.cvsignore rename to nspr/pr/src/cplus/tests/.cvsignore diff --git a/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in b/nspr/pr/src/cplus/tests/Makefile.in similarity index 84% rename from mozilla/nsprpub/pr/src/cplus/tests/Makefile.in rename to nspr/pr/src/cplus/tests/Makefile.in index af73897..181a920 100644 --- a/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in +++ b/nspr/pr/src/cplus/tests/Makefile.in @@ -69,12 +69,10 @@ endif # Solaris ifeq ($(OS_ARCH), SunOS) - ifneq ($(OS_RELEASE), 4.1.3_U1) - ifdef NS_USE_GCC - LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) - else - LDOPTS += -R $(PWD)/$(dist_libdir) - endif + ifdef NS_USE_GCC + LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) + else + LDOPTS += -R $(PWD)/$(dist_libdir) endif # SunOS 5.5 needs to link with -lpthread, even though we already @@ -136,24 +134,6 @@ ifeq ($(OS_ARCH), Linux) endif endif -ifeq ($(OS_ARCH), NCR) -# XXX: We see some strange problems when we link with libnspr.so. -# So for now we use static libraries on NCR. The shared library -# stuff below is commented out. -LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a -LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a -EXTRA_LIBS = -lsocket -lnsl -ldl - -# NCR needs to link against -lsocket -lnsl (and -lc, which is linked -# implicitly by $(CC)) again even though we already linked with these -# system libraries when we built libnspr.so. -#EXTRA_LIBS = -lsocket -lnsl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(dist_libdir) -endif - ifeq ($(OS_ARCH), SCO_SV) # SCO Unix needs to link against -lsocket again even though we # already linked with these system libraries when we built libnspr.so. diff --git a/mozilla/nsprpub/pr/src/cplus/tests/fileio.cpp b/nspr/pr/src/cplus/tests/fileio.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/fileio.cpp rename to nspr/pr/src/cplus/tests/fileio.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/interval.cpp b/nspr/pr/src/cplus/tests/interval.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/interval.cpp rename to nspr/pr/src/cplus/tests/interval.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/ranfile.cpp b/nspr/pr/src/cplus/tests/ranfile.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/ranfile.cpp rename to nspr/pr/src/cplus/tests/ranfile.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/switch.cpp b/nspr/pr/src/cplus/tests/switch.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/switch.cpp rename to nspr/pr/src/cplus/tests/switch.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/thread.cpp b/nspr/pr/src/cplus/tests/thread.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/thread.cpp rename to nspr/pr/src/cplus/tests/thread.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/time.cpp b/nspr/pr/src/cplus/tests/time.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/time.cpp rename to nspr/pr/src/cplus/tests/time.cpp diff --git a/mozilla/nsprpub/pr/src/cplus/tests/tpd.cpp b/nspr/pr/src/cplus/tests/tpd.cpp similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/tpd.cpp rename to nspr/pr/src/cplus/tests/tpd.cpp diff --git a/mozilla/nsprpub/pr/src/linking/.cvsignore b/nspr/pr/src/io/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/linking/.cvsignore rename to nspr/pr/src/io/.cvsignore diff --git a/mozilla/nsprpub/pr/src/io/Makefile.in b/nspr/pr/src/io/Makefile.in similarity index 87% rename from mozilla/nsprpub/pr/src/io/Makefile.in rename to nspr/pr/src/io/Makefile.in index d2ee274..f6b5bcd 100644 --- a/mozilla/nsprpub/pr/src/io/Makefile.in +++ b/nspr/pr/src/io/Makefile.in @@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - CSRCS = \ prfdcach.c \ prmwait.c \ diff --git a/mozilla/nsprpub/pr/src/io/prdir.c b/nspr/pr/src/io/prdir.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prdir.c rename to nspr/pr/src/io/prdir.c diff --git a/mozilla/nsprpub/pr/src/io/prfdcach.c b/nspr/pr/src/io/prfdcach.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prfdcach.c rename to nspr/pr/src/io/prfdcach.c diff --git a/mozilla/nsprpub/pr/src/io/prfile.c b/nspr/pr/src/io/prfile.c similarity index 98% rename from mozilla/nsprpub/pr/src/io/prfile.c rename to nspr/pr/src/io/prfile.c index aeb5423..e32031b 100644 --- a/mozilla/nsprpub/pr/src/io/prfile.c +++ b/nspr/pr/src/io/prfile.c @@ -365,7 +365,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFile( PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) { -#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX) +#if defined(XP_UNIX) && !defined(AIX) && !defined(QNX) struct rlimit rlim; if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) { @@ -374,7 +374,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) } return rlim.rlim_max; -#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX) +#elif defined(AIX) || defined(QNX) return sysconf(_SC_OPEN_MAX); #elif defined(WIN32) /* @@ -398,7 +398,7 @@ PR_IMPLEMENT(PRInt32) PR_GetSysfdTableMax(void) PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size) { -#if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX) +#if defined(XP_UNIX) && !defined(AIX) && !defined(QNX) struct rlimit rlim; PRInt32 tableMax = PR_GetSysfdTableMax(); @@ -433,7 +433,7 @@ PR_IMPLEMENT(PRInt32) PR_SetSysfdTableSize(int table_size) return -1; } return tableMax; -#elif defined(AIX) || defined(NEXTSTEP) || defined(QNX) \ +#elif defined(AIX) || defined(QNX) \ || defined(WIN32) || defined(WIN16) || defined(XP_BEOS) PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); return -1; diff --git a/mozilla/nsprpub/pr/src/io/prio.c b/nspr/pr/src/io/prio.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prio.c rename to nspr/pr/src/io/prio.c diff --git a/mozilla/nsprpub/pr/src/io/priometh.c b/nspr/pr/src/io/priometh.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/priometh.c rename to nspr/pr/src/io/priometh.c diff --git a/mozilla/nsprpub/pr/src/io/pripv6.c b/nspr/pr/src/io/pripv6.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/pripv6.c rename to nspr/pr/src/io/pripv6.c diff --git a/mozilla/nsprpub/pr/src/io/prlayer.c b/nspr/pr/src/io/prlayer.c similarity index 98% rename from mozilla/nsprpub/pr/src/io/prlayer.c rename to nspr/pr/src/io/prlayer.c index e29fe4a..faec909 100644 --- a/mozilla/nsprpub/pr/src/io/prlayer.c +++ b/nspr/pr/src/io/prlayer.c @@ -523,6 +523,11 @@ PR_IMPLEMENT(PRStatus) PR_PushIOLayer( *stack = *fd; *fd = copy; fd->higher = stack; + if (fd->lower) + { + PR_ASSERT(fd->lower->higher == stack); + fd->lower->higher = fd; + } stack->lower = fd; stack->higher = NULL; } else { @@ -561,6 +566,10 @@ PR_IMPLEMENT(PRFileDesc*) PR_PopIOLayer(PRFileDesc *stack, PRDescIdentity id) *stack = *extract; *extract = copy; stack->higher = NULL; + if (stack->lower) { + PR_ASSERT(stack->lower->higher == extract); + stack->lower->higher = stack; + } } else if ((PR_IO_LAYER_HEAD == stack->identity) && (extract == stack->lower) && (extract->lower == NULL)) { /* diff --git a/mozilla/nsprpub/pr/src/io/prlog.c b/nspr/pr/src/io/prlog.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prlog.c rename to nspr/pr/src/io/prlog.c diff --git a/mozilla/nsprpub/pr/src/io/prmapopt.c b/nspr/pr/src/io/prmapopt.c similarity index 98% rename from mozilla/nsprpub/pr/src/io/prmapopt.c rename to nspr/pr/src/io/prmapopt.c index bcde567..43e8f9c 100644 --- a/mozilla/nsprpub/pr/src/io/prmapopt.c +++ b/nspr/pr/src/io/prmapopt.c @@ -33,11 +33,6 @@ #include "primpl.h" -#if defined(NEXTSTEP) -/* NEXTSTEP is special: this must come before netinet/tcp.h. */ -#include /* n_short, n_long, n_time */ -#endif - #ifdef HAVE_NETINET_TCP_H #include /* TCP_NODELAY, TCP_MAXSEG */ #endif @@ -359,15 +354,9 @@ PRStatus PR_CALLBACK _PR_SocketSetSocketOption(PRFileDesc *fd, const PRSocketOpt #error "SO_LINGER is not defined" #endif -/* - * Some platforms, such as NCR 2.03, don't have TCP_NODELAY defined - * in - */ -#if !defined(NCR) #if !defined(TCP_NODELAY) #error "TCP_NODELAY is not defined" #endif -#endif /* * Make sure the value of _PR_NO_SUCH_SOCKOPT is not diff --git a/mozilla/nsprpub/pr/src/io/prmmap.c b/nspr/pr/src/io/prmmap.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prmmap.c rename to nspr/pr/src/io/prmmap.c diff --git a/mozilla/nsprpub/pr/src/io/prmwait.c b/nspr/pr/src/io/prmwait.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prmwait.c rename to nspr/pr/src/io/prmwait.c diff --git a/mozilla/nsprpub/pr/src/io/prpolevt.c b/nspr/pr/src/io/prpolevt.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prpolevt.c rename to nspr/pr/src/io/prpolevt.c diff --git a/mozilla/nsprpub/pr/src/io/prprf.c b/nspr/pr/src/io/prprf.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prprf.c rename to nspr/pr/src/io/prprf.c diff --git a/mozilla/nsprpub/pr/src/io/prscanf.c b/nspr/pr/src/io/prscanf.c similarity index 99% rename from mozilla/nsprpub/pr/src/io/prscanf.c rename to nspr/pr/src/io/prscanf.c index 357cc4e..b95d656 100644 --- a/mozilla/nsprpub/pr/src/io/prscanf.c +++ b/nspr/pr/src/io/prscanf.c @@ -16,9 +16,6 @@ #include #include #include -#ifdef SUNOS4 -#include "md/sunos4.h" /* for strtoul */ -#endif #include "prprf.h" #include "prdtoa.h" #include "prlog.h" diff --git a/mozilla/nsprpub/pr/src/io/prsocket.c b/nspr/pr/src/io/prsocket.c similarity index 99% rename from mozilla/nsprpub/pr/src/io/prsocket.c rename to nspr/pr/src/io/prsocket.c index ed7b4e4..be97024 100644 --- a/mozilla/nsprpub/pr/src/io/prsocket.c +++ b/nspr/pr/src/io/prsocket.c @@ -288,14 +288,6 @@ static PRStatus PR_CALLBACK SocketConnectContinue( #elif defined(WIN32) || defined(WIN16) -#if defined(WIN32) - /* - * The sleep circumvents a bug in Win32 WinSock. - * See Microsoft Knowledge Base article ID: Q165989. - */ - Sleep(0); -#endif /* WIN32 */ - if (out_flags & PR_POLL_EXCEPT) { int len = sizeof(err); if (getsockopt(osfd, (int)SOL_SOCKET, SO_ERROR, (char *) &err, &len) diff --git a/mozilla/nsprpub/pr/src/io/prstdio.c b/nspr/pr/src/io/prstdio.c similarity index 100% rename from mozilla/nsprpub/pr/src/io/prstdio.c rename to nspr/pr/src/io/prstdio.c diff --git a/mozilla/nsprpub/pr/src/io/.cvsignore b/nspr/pr/src/linking/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/io/.cvsignore rename to nspr/pr/src/linking/.cvsignore diff --git a/mozilla/nsprpub/pr/src/linking/Makefile.in b/nspr/pr/src/linking/Makefile.in similarity index 82% rename from mozilla/nsprpub/pr/src/linking/Makefile.in rename to nspr/pr/src/linking/Makefile.in index 128435f..9292e9e 100644 --- a/mozilla/nsprpub/pr/src/linking/Makefile.in +++ b/nspr/pr/src/linking/Makefile.in @@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - CSRCS = \ prlink.c \ $(NULL) diff --git a/mozilla/nsprpub/pr/src/linking/prlink.c b/nspr/pr/src/linking/prlink.c similarity index 99% rename from mozilla/nsprpub/pr/src/linking/prlink.c rename to nspr/pr/src/linking/prlink.c index c5ea63f..d9ad10a 100644 --- a/mozilla/nsprpub/pr/src/linking/prlink.c +++ b/nspr/pr/src/linking/prlink.c @@ -54,8 +54,8 @@ /* * On these platforms, symbols have a leading '_'. */ -#if defined(SUNOS4) || (defined(DARWIN) && defined(USE_MACH_DYLD)) \ - || defined(NEXTSTEP) || defined(XP_OS2) \ +#if (defined(DARWIN) && defined(USE_MACH_DYLD)) \ + || defined(XP_OS2) \ || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) #define NEED_LEADING_UNDERSCORE #endif @@ -959,12 +959,19 @@ PR_UnloadLibrary(PRLibrary *lib) int result = 0; PRStatus status = PR_SUCCESS; - if ((lib == 0) || (lib->refCount <= 0)) { + if (lib == 0) { PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); return PR_FAILURE; } PR_EnterMonitor(pr_linker_lock); + + if (lib->refCount <= 0) { + PR_ExitMonitor(pr_linker_lock); + PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0); + return PR_FAILURE; + } + if (--lib->refCount > 0) { PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("%s decr => %d", diff --git a/mozilla/nsprpub/pr/src/cplus/tests/.cvsignore b/nspr/pr/src/malloc/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/tests/.cvsignore rename to nspr/pr/src/malloc/.cvsignore diff --git a/mozilla/nsprpub/pr/src/malloc/Makefile.in b/nspr/pr/src/malloc/Makefile.in similarity index 82% rename from mozilla/nsprpub/pr/src/malloc/Makefile.in rename to nspr/pr/src/malloc/Makefile.in index 4a71b54..51f2a5a 100644 --- a/mozilla/nsprpub/pr/src/malloc/Makefile.in +++ b/nspr/pr/src/malloc/Makefile.in @@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - TARGETS = $(OBJS) INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private diff --git a/mozilla/nsprpub/pr/src/malloc/prmalloc.c b/nspr/pr/src/malloc/prmalloc.c similarity index 100% rename from mozilla/nsprpub/pr/src/malloc/prmalloc.c rename to nspr/pr/src/malloc/prmalloc.c diff --git a/mozilla/nsprpub/pr/src/malloc/prmem.c b/nspr/pr/src/malloc/prmem.c similarity index 100% rename from mozilla/nsprpub/pr/src/malloc/prmem.c rename to nspr/pr/src/malloc/prmem.c diff --git a/mozilla/nsprpub/pr/src/cplus/.cvsignore b/nspr/pr/src/md/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/cplus/.cvsignore rename to nspr/pr/src/md/.cvsignore diff --git a/mozilla/nsprpub/pr/src/md/Makefile.in b/nspr/pr/src/md/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/md/Makefile.in rename to nspr/pr/src/md/Makefile.in diff --git a/mozilla/nsprpub/pr/src/bthreads/.cvsignore b/nspr/pr/src/md/beos/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/src/bthreads/.cvsignore rename to nspr/pr/src/md/beos/.cvsignore diff --git a/mozilla/nsprpub/pr/src/md/beos/Makefile.in b/nspr/pr/src/md/beos/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/Makefile.in rename to nspr/pr/src/md/beos/Makefile.in diff --git a/mozilla/nsprpub/pr/src/md/beos/bcpu.c b/nspr/pr/src/md/beos/bcpu.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bcpu.c rename to nspr/pr/src/md/beos/bcpu.c diff --git a/mozilla/nsprpub/pr/src/md/beos/beos.c b/nspr/pr/src/md/beos/beos.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/beos.c rename to nspr/pr/src/md/beos/beos.c diff --git a/mozilla/nsprpub/pr/src/md/beos/beos_errors.c b/nspr/pr/src/md/beos/beos_errors.c similarity index 99% rename from mozilla/nsprpub/pr/src/md/beos/beos_errors.c rename to nspr/pr/src/md/beos/beos_errors.c index 4e37a26..687a535 100644 --- a/mozilla/nsprpub/pr/src/md/beos/beos_errors.c +++ b/nspr/pr/src/md/beos/beos_errors.c @@ -989,7 +989,7 @@ void _MD_unix_map_connect_error(int err) PR_SetError(PR_INVALID_ARGUMENT_ERROR, err); break; case EIO: -#if defined(UNIXWARE) || defined(SNI) || defined(NEC) +#if defined(UNIXWARE) /* * On some platforms, if we connect to a port on * the local host (the loopback address) that no diff --git a/mozilla/nsprpub/pr/src/md/beos/bfile.c b/nspr/pr/src/md/beos/bfile.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bfile.c rename to nspr/pr/src/md/beos/bfile.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bmemory.c b/nspr/pr/src/md/beos/bmemory.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bmemory.c rename to nspr/pr/src/md/beos/bmemory.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bmisc.c b/nspr/pr/src/md/beos/bmisc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bmisc.c rename to nspr/pr/src/md/beos/bmisc.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bmmap.c b/nspr/pr/src/md/beos/bmmap.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bmmap.c rename to nspr/pr/src/md/beos/bmmap.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bnet.c b/nspr/pr/src/md/beos/bnet.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bnet.c rename to nspr/pr/src/md/beos/bnet.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bproc.c b/nspr/pr/src/md/beos/bproc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bproc.c rename to nspr/pr/src/md/beos/bproc.c diff --git a/mozilla/nsprpub/pr/src/md/beos/brng.c b/nspr/pr/src/md/beos/brng.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/brng.c rename to nspr/pr/src/md/beos/brng.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bseg.c b/nspr/pr/src/md/beos/bseg.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bseg.c rename to nspr/pr/src/md/beos/bseg.c diff --git a/mozilla/nsprpub/pr/src/md/beos/bsrcs.mk b/nspr/pr/src/md/beos/bsrcs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/bsrcs.mk rename to nspr/pr/src/md/beos/bsrcs.mk diff --git a/mozilla/nsprpub/pr/src/md/beos/btime.c b/nspr/pr/src/md/beos/btime.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/btime.c rename to nspr/pr/src/md/beos/btime.c diff --git a/mozilla/nsprpub/pr/src/md/beos/objs.mk b/nspr/pr/src/md/beos/objs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/md/beos/objs.mk rename to nspr/pr/src/md/beos/objs.mk diff --git a/mozilla/nsprpub/pr/include/private/.cvsignore b/nspr/pr/src/md/os2/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/include/private/.cvsignore rename to nspr/pr/src/md/os2/.cvsignore diff --git a/mozilla/nsprpub/pr/src/md/os2/Makefile.in b/nspr/pr/src/md/os2/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/Makefile.in rename to nspr/pr/src/md/os2/Makefile.in diff --git a/mozilla/nsprpub/pr/src/md/os2/objs.mk b/nspr/pr/src/md/os2/objs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/objs.mk rename to nspr/pr/src/md/os2/objs.mk diff --git a/mozilla/nsprpub/pr/src/md/os2/os2_errors.c b/nspr/pr/src/md/os2/os2_errors.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2_errors.c rename to nspr/pr/src/md/os2/os2_errors.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2cv.c b/nspr/pr/src/md/os2/os2cv.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2cv.c rename to nspr/pr/src/md/os2/os2cv.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2emx.s b/nspr/pr/src/md/os2/os2emx.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2emx.s rename to nspr/pr/src/md/os2/os2emx.s diff --git a/mozilla/nsprpub/pr/src/md/os2/os2gc.c b/nspr/pr/src/md/os2/os2gc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2gc.c rename to nspr/pr/src/md/os2/os2gc.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2inrval.c b/nspr/pr/src/md/os2/os2inrval.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2inrval.c rename to nspr/pr/src/md/os2/os2inrval.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2io.c b/nspr/pr/src/md/os2/os2io.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2io.c rename to nspr/pr/src/md/os2/os2io.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2misc.c b/nspr/pr/src/md/os2/os2misc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2misc.c rename to nspr/pr/src/md/os2/os2misc.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2poll.c b/nspr/pr/src/md/os2/os2poll.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2poll.c rename to nspr/pr/src/md/os2/os2poll.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2rng.c b/nspr/pr/src/md/os2/os2rng.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2rng.c rename to nspr/pr/src/md/os2/os2rng.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2sem.c b/nspr/pr/src/md/os2/os2sem.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2sem.c rename to nspr/pr/src/md/os2/os2sem.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2sock.c b/nspr/pr/src/md/os2/os2sock.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2sock.c rename to nspr/pr/src/md/os2/os2sock.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2thred.c b/nspr/pr/src/md/os2/os2thred.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2thred.c rename to nspr/pr/src/md/os2/os2thred.c diff --git a/mozilla/nsprpub/pr/src/md/os2/os2vaclegacy.s b/nspr/pr/src/md/os2/os2vaclegacy.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/os2/os2vaclegacy.s rename to nspr/pr/src/md/os2/os2vaclegacy.s diff --git a/mozilla/nsprpub/pr/src/md/prosdep.c b/nspr/pr/src/md/prosdep.c similarity index 90% rename from mozilla/nsprpub/pr/src/md/prosdep.c rename to nspr/pr/src/md/prosdep.c index 8df1b69..137ffae 100644 --- a/mozilla/nsprpub/pr/src/md/prosdep.c +++ b/nspr/pr/src/md/prosdep.c @@ -9,9 +9,6 @@ #ifdef XP_UNIX #include #endif -#ifdef SUNOS4 -#include "md/sunos4.h" -#endif #ifdef _WIN32 #include #endif @@ -31,10 +28,10 @@ static void GetPageSize(void) /* Get page size */ #ifdef XP_UNIX -#if defined SUNOS4 || defined BSDI || defined AIX \ +#if defined BSDI || defined AIX \ || defined LINUX || defined __GNU__ || defined __GLIBC__ \ || defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined DARWIN || defined NEXTSTEP || defined SYMBIAN + || defined DARWIN || defined SYMBIAN _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ diff --git a/mozilla/nsprpub/pr/include/obsolete/.cvsignore b/nspr/pr/src/md/unix/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/include/obsolete/.cvsignore rename to nspr/pr/src/md/unix/.cvsignore diff --git a/mozilla/nsprpub/pr/src/md/unix/Makefile.in b/nspr/pr/src/md/unix/Makefile.in similarity index 96% rename from mozilla/nsprpub/pr/src/md/unix/Makefile.in rename to nspr/pr/src/md/unix/Makefile.in index 403abe9..f241840 100644 --- a/mozilla/nsprpub/pr/src/md/unix/Makefile.in +++ b/nspr/pr/src/md/unix/Makefile.in @@ -36,8 +36,7 @@ ASFILES += $(PR_MD_ASFILES) TARGETS = $(OBJS) ifeq ($(OS_ARCH),SunOS) - ifneq ($(OS_RELEASE),4.1.3_U1) - ifeq ($(CPU_ARCH),sparc) + ifeq ($(CPU_ARCH),sparc) ifdef USE_64 ULTRASPARC_ASFILES = os_SunOS_sparcv9.s ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX))) @@ -51,7 +50,6 @@ ifeq ($(OS_ARCH),SunOS) RELEASE_LIBS_DEST = $(RELEASE_LIB_DIR)/cpu/sparcv8plus lib_subdir = cpu/sparcv8plus endif - endif endif endif @@ -64,7 +62,6 @@ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) ifeq ($(OS_ARCH),SunOS) -ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(CPU_ARCH),sparc) ifdef USE_64 @@ -100,4 +97,3 @@ endif endif endif -endif diff --git a/mozilla/nsprpub/pr/src/md/unix/aix.c b/nspr/pr/src/md/unix/aix.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/aix.c rename to nspr/pr/src/md/unix/aix.c diff --git a/mozilla/nsprpub/pr/src/md/unix/aixwrap.c b/nspr/pr/src/md/unix/aixwrap.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/aixwrap.c rename to nspr/pr/src/md/unix/aixwrap.c diff --git a/mozilla/nsprpub/pr/src/md/unix/bsdi.c b/nspr/pr/src/md/unix/bsdi.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/bsdi.c rename to nspr/pr/src/md/unix/bsdi.c diff --git a/mozilla/nsprpub/pr/src/md/unix/darwin.c b/nspr/pr/src/md/unix/darwin.c similarity index 66% rename from mozilla/nsprpub/pr/src/md/unix/darwin.c rename to nspr/pr/src/md/unix/darwin.c index 98df03d..719fc30 100644 --- a/mozilla/nsprpub/pr/src/md/unix/darwin.c +++ b/nspr/pr/src/md/unix/darwin.c @@ -5,10 +5,45 @@ #include "primpl.h" +#include + void _MD_EarlyInit(void) { } +/* + * The multiplier (as a fraction) for converting the Mach absolute time + * unit to nanoseconds. + */ +static mach_timebase_info_data_t machTimebaseInfo; + +void _PR_Mach_IntervalInit(void) +{ + kern_return_t rv; + + rv = mach_timebase_info(&machTimebaseInfo); + PR_ASSERT(rv == KERN_SUCCESS); +} + +PRIntervalTime _PR_Mach_GetInterval(void) +{ + uint64_t time; + + /* + * mach_absolute_time returns the time in the Mach absolute time unit. + * Convert it to milliseconds. See Mac Technical Q&A QA1398. + */ + time = mach_absolute_time(); + time = time * machTimebaseInfo.numer / machTimebaseInfo.denom / + PR_NSEC_PER_MSEC; + return (PRIntervalTime)time; +} /* _PR_Mach_GetInterval */ + +PRIntervalTime _PR_Mach_TicksPerSecond(void) +{ + return 1000; +} + PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) { #if !defined(_PR_PTHREADS) diff --git a/mozilla/nsprpub/pr/src/md/unix/dgux.c b/nspr/pr/src/md/unix/dgux.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/dgux.c rename to nspr/pr/src/md/unix/dgux.c diff --git a/mozilla/nsprpub/pr/src/md/unix/freebsd.c b/nspr/pr/src/md/unix/freebsd.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/freebsd.c rename to nspr/pr/src/md/unix/freebsd.c diff --git a/mozilla/nsprpub/pr/src/md/unix/hpux.c b/nspr/pr/src/md/unix/hpux.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/hpux.c rename to nspr/pr/src/md/unix/hpux.c diff --git a/mozilla/nsprpub/pr/src/md/unix/irix.c b/nspr/pr/src/md/unix/irix.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/irix.c rename to nspr/pr/src/md/unix/irix.c diff --git a/mozilla/nsprpub/pr/src/md/unix/linux.c b/nspr/pr/src/md/unix/linux.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/linux.c rename to nspr/pr/src/md/unix/linux.c diff --git a/mozilla/nsprpub/pr/src/md/unix/netbsd.c b/nspr/pr/src/md/unix/netbsd.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/netbsd.c rename to nspr/pr/src/md/unix/netbsd.c diff --git a/mozilla/nsprpub/pr/src/md/unix/nto.c b/nspr/pr/src/md/unix/nto.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/nto.c rename to nspr/pr/src/md/unix/nto.c diff --git a/mozilla/nsprpub/pr/src/md/unix/objs.mk b/nspr/pr/src/md/unix/objs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/objs.mk rename to nspr/pr/src/md/unix/objs.mk diff --git a/mozilla/nsprpub/pr/src/md/unix/openbsd.c b/nspr/pr/src/md/unix/openbsd.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/openbsd.c rename to nspr/pr/src/md/unix/openbsd.c diff --git a/mozilla/nsprpub/pr/src/md/unix/os_AIX.s b/nspr/pr/src/md/unix/os_AIX.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_AIX.s rename to nspr/pr/src/md/unix/os_AIX.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_BSD_386_2.s b/nspr/pr/src/md/unix/os_BSD_386_2.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_BSD_386_2.s rename to nspr/pr/src/md/unix/os_BSD_386_2.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Darwin.s b/nspr/pr/src/md/unix/os_Darwin.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Darwin.s rename to nspr/pr/src/md/unix/os_Darwin.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Darwin_ppc.s b/nspr/pr/src/md/unix/os_Darwin_ppc.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Darwin_ppc.s rename to nspr/pr/src/md/unix/os_Darwin_ppc.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Darwin_x86.s b/nspr/pr/src/md/unix/os_Darwin_x86.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Darwin_x86.s rename to nspr/pr/src/md/unix/os_Darwin_x86.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Darwin_x86_64.s b/nspr/pr/src/md/unix/os_Darwin_x86_64.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Darwin_x86_64.s rename to nspr/pr/src/md/unix/os_Darwin_x86_64.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_HPUX.s b/nspr/pr/src/md/unix/os_HPUX.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_HPUX.s rename to nspr/pr/src/md/unix/os_HPUX.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_HPUX_ia64.s b/nspr/pr/src/md/unix/os_HPUX_ia64.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_HPUX_ia64.s rename to nspr/pr/src/md/unix/os_HPUX_ia64.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Irix.s b/nspr/pr/src/md/unix/os_Irix.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Irix.s rename to nspr/pr/src/md/unix/os_Irix.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Linux_ia64.s b/nspr/pr/src/md/unix/os_Linux_ia64.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Linux_ia64.s rename to nspr/pr/src/md/unix/os_Linux_ia64.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Linux_ppc.s b/nspr/pr/src/md/unix/os_Linux_ppc.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Linux_ppc.s rename to nspr/pr/src/md/unix/os_Linux_ppc.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s b/nspr/pr/src/md/unix/os_Linux_x86.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s rename to nspr/pr/src/md/unix/os_Linux_x86.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s b/nspr/pr/src/md/unix/os_Linux_x86_64.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s rename to nspr/pr/src/md/unix/os_Linux_x86_64.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s b/nspr/pr/src/md/unix/os_SunOS_sparcv9.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_SunOS_sparcv9.s rename to nspr/pr/src/md/unix/os_SunOS_sparcv9.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s b/nspr/pr/src/md/unix/os_SunOS_ultrasparc.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s rename to nspr/pr/src/md/unix/os_SunOS_ultrasparc.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s b/nspr/pr/src/md/unix/os_SunOS_x86.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86.s rename to nspr/pr/src/md/unix/os_SunOS_x86.s diff --git a/mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s b/nspr/pr/src/md/unix/os_SunOS_x86_64.s similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/os_SunOS_x86_64.s rename to nspr/pr/src/md/unix/os_SunOS_x86_64.s diff --git a/mozilla/nsprpub/pr/src/md/unix/osf1.c b/nspr/pr/src/md/unix/osf1.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/osf1.c rename to nspr/pr/src/md/unix/osf1.c diff --git a/mozilla/nsprpub/pr/src/md/unix/pthreads_user.c b/nspr/pr/src/md/unix/pthreads_user.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/pthreads_user.c rename to nspr/pr/src/md/unix/pthreads_user.c diff --git a/mozilla/nsprpub/pr/src/md/unix/qnx.c b/nspr/pr/src/md/unix/qnx.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/qnx.c rename to nspr/pr/src/md/unix/qnx.c diff --git a/mozilla/nsprpub/pr/src/md/unix/riscos.c b/nspr/pr/src/md/unix/riscos.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/riscos.c rename to nspr/pr/src/md/unix/riscos.c diff --git a/mozilla/nsprpub/pr/src/md/unix/scoos.c b/nspr/pr/src/md/unix/scoos.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/scoos.c rename to nspr/pr/src/md/unix/scoos.c diff --git a/mozilla/nsprpub/pr/src/md/unix/solaris.c b/nspr/pr/src/md/unix/solaris.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/solaris.c rename to nspr/pr/src/md/unix/solaris.c diff --git a/mozilla/nsprpub/pr/src/md/unix/symbian.c b/nspr/pr/src/md/unix/symbian.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/symbian.c rename to nspr/pr/src/md/unix/symbian.c diff --git a/mozilla/nsprpub/pr/src/md/unix/unix.c b/nspr/pr/src/md/unix/unix.c similarity index 99% rename from mozilla/nsprpub/pr/src/md/unix/unix.c rename to nspr/pr/src/md/unix/unix.c index 9a91a01..02962e6 100644 --- a/mozilla/nsprpub/pr/src/md/unix/unix.c +++ b/nspr/pr/src/md/unix/unix.c @@ -22,8 +22,7 @@ #endif /* To get FIONREAD */ -#if defined(NCR) || defined(UNIXWARE) || defined(NEC) || defined(SNI) \ - || defined(SONY) +#if defined(UNIXWARE) #include #endif @@ -39,10 +38,10 @@ || (defined(__GLIBC__) && __GLIBC__ >= 2) #define _PRSockLen_t socklen_t #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ - || defined(BSDI) || defined(SCO) || defined(NEC) || defined(SNI) \ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) + || defined(AIX4_1) || defined(LINUX) \ + || defined(BSDI) || defined(SCO) \ + || defined(DARWIN) \ + || defined(QNX) #define _PRSockLen_t int #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ @@ -768,7 +767,7 @@ PRInt32 _MD_recv(PRFileDesc *fd, void *buf, PRInt32 amount, * from socketpairs. As long as we don't use flags on socketpairs, this * is a decent fix. - mikep */ -#if defined(UNIXWARE) || defined(SOLARIS) || defined(NCR) +#if defined(UNIXWARE) || defined(SOLARIS) while ((rv = read(osfd,buf,amount)) == -1) { #else while ((rv = recv(osfd,buf,amount,flags)) == -1) { @@ -2177,11 +2176,7 @@ void _MD_MakeNonblock(PRFileDesc *fd) * otherwise connect() still blocks and can be interrupted by SIGALRM. */ -#ifdef SUNOS4 - fcntl(osfd, F_SETFL, flags | FNDELAY); -#else fcntl(osfd, F_SETFL, flags | O_NONBLOCK); -#endif } PRInt32 _MD_open(const char *name, PRIntn flags, PRIntn mode) @@ -3017,6 +3012,13 @@ PR_Now(void) return s; } +#if defined(_MD_INTERVAL_USE_GTOD) +/* + * This version of interval times is based on the time of day + * capability offered by the system. This isn't valid for two reasons: + * 1) The time of day is neither linear nor montonically increasing + * 2) The units here are milliseconds. That's not appropriate for our use. + */ PRIntervalTime _PR_UNIX_GetInterval() { struct timeval time; @@ -3026,12 +3028,35 @@ PRIntervalTime _PR_UNIX_GetInterval() ticks = (PRUint32)time.tv_sec * PR_MSEC_PER_SEC; /* that's in milliseconds */ ticks += (PRUint32)time.tv_usec / PR_USEC_PER_MSEC; /* so's that */ return ticks; -} /* _PR_SUNOS_GetInterval */ +} /* _PR_UNIX_GetInterval */ PRIntervalTime _PR_UNIX_TicksPerSecond() { return 1000; /* this needs some work :) */ } +#endif + +#if defined(HAVE_CLOCK_MONOTONIC) +PRIntervalTime _PR_UNIX_GetInterval2() +{ + struct timespec time; + PRIntervalTime ticks; + + if (clock_gettime(CLOCK_MONOTONIC, &time) != 0) { + fprintf(stderr, "clock_gettime failed: %d\n", errno); + abort(); + } + + ticks = (PRUint32)time.tv_sec * PR_MSEC_PER_SEC; + ticks += (PRUint32)time.tv_nsec / PR_NSEC_PER_MSEC; + return ticks; +} + +PRIntervalTime _PR_UNIX_TicksPerSecond2() +{ + return 1000; +} +#endif #if !defined(_PR_PTHREADS) /* @@ -3292,7 +3317,7 @@ int _MD_unix_get_nonblocking_connect_error(int osfd) } else { return ECONNREFUSED; } -#elif defined(NCR) || defined(UNIXWARE) || defined(SNI) || defined(NEC) +#elif defined(UNIXWARE) /* * getsockopt() fails with EPIPE, so use getmsg() instead. */ diff --git a/mozilla/nsprpub/pr/src/md/unix/unix_errors.c b/nspr/pr/src/md/unix/unix_errors.c similarity index 99% rename from mozilla/nsprpub/pr/src/md/unix/unix_errors.c rename to nspr/pr/src/md/unix/unix_errors.c index 5fd95d2..f65f4fe 100644 --- a/mozilla/nsprpub/pr/src/md/unix/unix_errors.c +++ b/nspr/pr/src/md/unix/unix_errors.c @@ -531,7 +531,7 @@ void _MD_unix_map_connect_error(int err) case EACCES: prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; break; -#if defined(UNIXWARE) || defined(SNI) || defined(NEC) +#if defined(UNIXWARE) /* * On some platforms, if we connect to a port on the local host * (the loopback address) that no process is listening on, we get diff --git a/mozilla/nsprpub/pr/src/md/unix/unixware.c b/nspr/pr/src/md/unix/unixware.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/unixware.c rename to nspr/pr/src/md/unix/unixware.c diff --git a/mozilla/nsprpub/pr/src/md/unix/uxpoll.c b/nspr/pr/src/md/unix/uxpoll.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/uxpoll.c rename to nspr/pr/src/md/unix/uxpoll.c diff --git a/mozilla/nsprpub/pr/src/md/unix/uxproces.c b/nspr/pr/src/md/unix/uxproces.c similarity index 99% rename from mozilla/nsprpub/pr/src/md/unix/uxproces.c rename to nspr/pr/src/md/unix/uxproces.c index 95dd074..a3b35e5 100644 --- a/mozilla/nsprpub/pr/src/md/unix/uxproces.c +++ b/nspr/pr/src/md/unix/uxproces.c @@ -711,11 +711,6 @@ static PRStatus _MD_InitProcesses(void) int rv; int flags; #endif -#ifdef SUNOS4 -#define _PR_NBIO_FLAG FNDELAY -#else -#define _PR_NBIO_FLAG O_NONBLOCK -#endif #ifdef AIX { @@ -739,9 +734,9 @@ static PRStatus _MD_InitProcesses(void) rv = pipe(pr_wp.pipefd); PR_ASSERT(0 == rv); flags = fcntl(pr_wp.pipefd[0], F_GETFL, 0); - fcntl(pr_wp.pipefd[0], F_SETFL, flags | _PR_NBIO_FLAG); + fcntl(pr_wp.pipefd[0], F_SETFL, flags | O_NONBLOCK); flags = fcntl(pr_wp.pipefd[1], F_GETFL, 0); - fcntl(pr_wp.pipefd[1], F_SETFL, flags | _PR_NBIO_FLAG); + fcntl(pr_wp.pipefd[1], F_SETFL, flags | O_NONBLOCK); #ifndef _PR_SHARE_CLONES pr_InstallSigchldHandler(); diff --git a/mozilla/nsprpub/pr/src/md/unix/uxrng.c b/nspr/pr/src/md/unix/uxrng.c similarity index 90% rename from mozilla/nsprpub/pr/src/md/unix/uxrng.c rename to nspr/pr/src/md/unix/uxrng.c index 7223aa3..da2f7e9 100644 --- a/mozilla/nsprpub/pr/src/md/unix/uxrng.c +++ b/nspr/pr/src/md/unix/uxrng.c @@ -25,14 +25,6 @@ GetHighResClock(void *buf, size_t maxbytes) return 0; } -#elif defined(SUNOS4) - -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - return 0; -} - #elif defined(HPUX) #ifdef __ia64 @@ -134,14 +126,6 @@ GetHighResClock(void *buf, size_t maxbytes) return(GetDevURandom( buf, maxbytes )); } -#elif defined(NCR) - -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - return 0; -} - #elif defined(IRIX) #include #undef PRIVATE @@ -225,34 +209,6 @@ static size_t GetHighResClock(void *buf, size_t maxbuf) return _pr_CopyLowBits(buf, maxbuf, &s0, cntr_size); } -#elif defined(SONY) - -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - return 0; -} - -#elif defined(SNI) -#include - -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - int ticks; - struct tms buffer; - - ticks=times(&buffer); - return _pr_CopyLowBits(buf, maxbytes, &ticks, sizeof(ticks)); -} - -#elif defined(NEC) - -static size_t -GetHighResClock(void *buf, size_t maxbytes) -{ - return 0; -} #elif defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(NTO) \ || defined(QNX) || defined(DARWIN) || defined(RISCOS) #include diff --git a/mozilla/nsprpub/pr/src/md/unix/uxshm.c b/nspr/pr/src/md/unix/uxshm.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/unix/uxshm.c rename to nspr/pr/src/md/unix/uxshm.c diff --git a/mozilla/nsprpub/pr/src/md/unix/uxwrap.c b/nspr/pr/src/md/unix/uxwrap.c similarity index 98% rename from mozilla/nsprpub/pr/src/md/unix/uxwrap.c rename to nspr/pr/src/md/unix/uxwrap.c index b183e5a..3f8e149 100644 --- a/mozilla/nsprpub/pr/src/md/unix/uxwrap.c +++ b/nspr/pr/src/md/unix/uxwrap.c @@ -70,9 +70,6 @@ void PR_SetXtHackOkayToReleaseXLockFn(int (*fn)(void)) #if defined(HPUX9) int select(size_t width, int *rl, int *wl, int *el, const struct timeval *tv) -#elif defined(NEXTSTEP) -int wrap_select(int width, fd_set *rd, fd_set *wr, fd_set *ex, - const struct timeval *tv) #elif defined(AIX_RENAME_SELECT) int wrap_select(unsigned long width, void *rl, void *wl, void *el, struct timeval *tv) @@ -258,7 +255,7 @@ int select(int width, fd_set *rd, fd_set *wr, fd_set *ex, struct timeval *tv) nbits++; } PR_ASSERT(nbits > 0); -#if defined(HPUX) || defined(SOLARIS) || defined(SUNOS4) || defined(OSF1) || defined(AIX) +#if defined(HPUX) || defined(SOLARIS) || defined(OSF1) || defined(AIX) retVal += nbits; #else /* IRIX */ retVal += 1; diff --git a/mozilla/nsprpub/pr/include/md/.cvsignore b/nspr/pr/src/md/windows/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/include/md/.cvsignore rename to nspr/pr/src/md/windows/.cvsignore diff --git a/mozilla/nsprpub/pr/src/md/windows/Makefile.in b/nspr/pr/src/md/windows/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/Makefile.in rename to nspr/pr/src/md/windows/Makefile.in diff --git a/mozilla/nsprpub/pr/src/md/windows/ntdllmn.c b/nspr/pr/src/md/windows/ntdllmn.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntdllmn.c rename to nspr/pr/src/md/windows/ntdllmn.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntgc.c b/nspr/pr/src/md/windows/ntgc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntgc.c rename to nspr/pr/src/md/windows/ntgc.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntinrval.c b/nspr/pr/src/md/windows/ntinrval.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntinrval.c rename to nspr/pr/src/md/windows/ntinrval.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntio.c b/nspr/pr/src/md/windows/ntio.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntio.c rename to nspr/pr/src/md/windows/ntio.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntmisc.c b/nspr/pr/src/md/windows/ntmisc.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntmisc.c rename to nspr/pr/src/md/windows/ntmisc.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntsec.c b/nspr/pr/src/md/windows/ntsec.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntsec.c rename to nspr/pr/src/md/windows/ntsec.c diff --git a/mozilla/nsprpub/pr/src/md/windows/ntsem.c b/nspr/pr/src/md/windows/ntsem.c similarity index 93% rename from mozilla/nsprpub/pr/src/md/windows/ntsem.c rename to nspr/pr/src/md/windows/ntsem.c index cc71fe3..f36a145 100644 --- a/mozilla/nsprpub/pr/src/md/windows/ntsem.c +++ b/nspr/pr/src/md/windows/ntsem.c @@ -46,7 +46,5 @@ _PR_MD_WAIT_SEM(_MDSemaphore *md) void _PR_MD_POST_SEM(_MDSemaphore *md) { - int old_count; - - ReleaseSemaphore(md->sem, 1, &old_count); + ReleaseSemaphore(md->sem, 1, NULL); } diff --git a/mozilla/nsprpub/pr/src/md/windows/ntthread.c b/nspr/pr/src/md/windows/ntthread.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/ntthread.c rename to nspr/pr/src/md/windows/ntthread.c diff --git a/mozilla/nsprpub/pr/src/md/windows/objs.mk b/nspr/pr/src/md/windows/objs.mk similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/objs.mk rename to nspr/pr/src/md/windows/objs.mk diff --git a/mozilla/nsprpub/pr/src/md/windows/w32ipcsem.c b/nspr/pr/src/md/windows/w32ipcsem.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w32ipcsem.c rename to nspr/pr/src/md/windows/w32ipcsem.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w32poll.c b/nspr/pr/src/md/windows/w32poll.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w32poll.c rename to nspr/pr/src/md/windows/w32poll.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w32rng.c b/nspr/pr/src/md/windows/w32rng.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w32rng.c rename to nspr/pr/src/md/windows/w32rng.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w32shm.c b/nspr/pr/src/md/windows/w32shm.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w32shm.c rename to nspr/pr/src/md/windows/w32shm.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w95cv.c b/nspr/pr/src/md/windows/w95cv.c similarity index 84% rename from mozilla/nsprpub/pr/src/md/windows/w95cv.c rename to nspr/pr/src/md/windows/w95cv.c index afff1b7..27b34e6 100644 --- a/mozilla/nsprpub/pr/src/md/windows/w95cv.c +++ b/nspr/pr/src/md/windows/w95cv.c @@ -304,6 +304,59 @@ void _PR_MD_NOTIFYALL_CV(_MDCVar *cv, _MDLock *lock) return; } +typedef BOOL (WINAPI *INITIALIZECRITICALSECTIONEX)( + CRITICAL_SECTION *lpCriticalSection, + DWORD dwSpinCount, + DWORD Flags); + +static INITIALIZECRITICALSECTIONEX sInitializeCriticalSectionEx; + +void _PR_MD_INIT_LOCKS(void) +{ + /* + * Starting with Windows Vista, every CRITICAL_SECTION allocates an extra + * RTL_CRITICAL_SECTION_DEBUG object. Unfortunately, this debug object is + * not reclaimed by DeleteCriticalSection(), causing an apparent memory + * leak. This is a debugging "feature", not a bug. If we are running on + * Vista or later, use InitializeCriticalSectionEx() to allocate + * CRITICAL_SECTIONs without debug objects. + */ + HMODULE hKernel32 = GetModuleHandle("kernel32.dll"); + PR_ASSERT(hKernel32); + PR_ASSERT(!sInitializeCriticalSectionEx); + sInitializeCriticalSectionEx = (INITIALIZECRITICALSECTIONEX) + GetProcAddress(hKernel32, "InitializeCriticalSectionEx"); +} + +/* + * By default, CRITICAL_SECTIONs are initialized with a spin count of 0. + * Joe Duffy's "Concurrent Programming on Windows" book suggests 1500 is + * a "reasonable starting point". On single-processor systems, the spin + * count is ignored and the critical section spin count is set to 0. + */ +#define LOCK_SPIN_COUNT 1500 + +PRStatus _PR_MD_NEW_LOCK(_MDLock *lock) +{ + CRITICAL_SECTION *cs = &lock->mutex; + BOOL ok; + + if (sInitializeCriticalSectionEx) { + ok = sInitializeCriticalSectionEx(cs, LOCK_SPIN_COUNT, + CRITICAL_SECTION_NO_DEBUG_INFO); + } else { + ok = InitializeCriticalSectionAndSpinCount(cs, LOCK_SPIN_COUNT); + } + if (!ok) { + _PR_MD_MAP_DEFAULT_ERROR(GetLastError()); + return PR_FAILURE; + } + + lock->notified.length = 0; + lock->notified.link = NULL; + return PR_SUCCESS; +} + void _PR_MD_UNLOCK(_MDLock *lock) { if (0 != lock->notified.length) { @@ -311,5 +364,4 @@ void _PR_MD_UNLOCK(_MDLock *lock) } else { LeaveCriticalSection(&lock->mutex); } - return; } diff --git a/mozilla/nsprpub/pr/src/md/windows/w95dllmain.c b/nspr/pr/src/md/windows/w95dllmain.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w95dllmain.c rename to nspr/pr/src/md/windows/w95dllmain.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w95io.c b/nspr/pr/src/md/windows/w95io.c similarity index 75% rename from mozilla/nsprpub/pr/src/md/windows/w95io.c rename to nspr/pr/src/md/windows/w95io.c index dad08f2..824b6ff 100644 --- a/mozilla/nsprpub/pr/src/md/windows/w95io.c +++ b/nspr/pr/src/md/windows/w95io.c @@ -16,197 +16,6 @@ #include #endif /* MOZ_UNICODE */ -#ifdef WINCE - -static HANDLE CreateFileA(LPCSTR lpFileName, - DWORD dwDesiredAccess, - DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttributes, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttributes, - HANDLE hTemplateFile) -{ - PRUnichar wFileName[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, lpFileName, -1, wFileName, MAX_PATH); - return CreateFileW(wFileName, dwDesiredAccess, dwShareMode, - lpSecurityAttributes, dwCreationDisposition, - dwFlagsAndAttributes, hTemplateFile); -} - -/* - * We seem to call FindFirstFileA and FindNextFileA just to get - * the file names in a directory listing. If so, we could define - * a custom WIN32_FIND_DATAA structure with just the cFileName - * member, and the CopyFindFileDataW2A function could just - * copy/convert the cFileName member. - */ -static void CopyFindFileDataW2A(LPWIN32_FIND_DATAW from, - LPWIN32_FIND_DATAA to) -{ - /* - * WIN32_FIND_DATAA and WIN32_FIND_DATAW are slightly different. - * The dwReserved0, dwReserved1, and cAlternateFileName members - * exist only in WIN32_FIND_DATAA. The dwOID member exists only - * in WIN32_FIND_DATAW. - */ - to->dwFileAttributes = from->dwFileAttributes; - to->ftCreationTime = from->ftCreationTime; - to->ftLastAccessTime = from->ftLastAccessTime; - to->ftLastWriteTime = from->ftLastWriteTime; - to->nFileSizeHigh = from->nFileSizeHigh; - to->nFileSizeLow = from->nFileSizeLow; - to->dwReserved0 = 0; - to->dwReserved1 = 0; - WideCharToMultiByte(CP_ACP, 0, from->cFileName, -1, - to->cFileName, MAX_PATH, NULL, NULL); - to->cAlternateFileName[0] = '\0'; -} - -static HANDLE FindFirstFileA(LPCSTR lpFileName, - LPWIN32_FIND_DATAA lpFindFileData) -{ - PRUnichar wFileName[MAX_PATH]; - HANDLE hFindFile; - WIN32_FIND_DATAW wFindFileData; - - MultiByteToWideChar(CP_ACP, 0, lpFileName, -1, wFileName, MAX_PATH); - hFindFile = FindFirstFileW(wFileName, &wFindFileData); - if (hFindFile != INVALID_HANDLE_VALUE) { - CopyFindFileDataW2A(&wFindFileData, lpFindFileData); - } - return hFindFile; -} - -static BOOL FindNextFileA(HANDLE hFindFile, - LPWIN32_FIND_DATAA lpFindFileData) -{ - WIN32_FIND_DATAW wFindFileData; - BOOL rv; - - rv = FindNextFileW(hFindFile, &wFindFileData); - if (rv) { - CopyFindFileDataW2A(&wFindFileData, lpFindFileData); - } - return rv; -} - -static BOOL GetFileAttributesExA(LPCSTR lpFileName, - GET_FILEEX_INFO_LEVELS fInfoLevelId, - LPVOID lpFileInformation) -{ - PRUnichar wFileName[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, lpFileName, -1, wFileName, MAX_PATH); - return GetFileAttributesExW(wFileName, fInfoLevelId, lpFileInformation); -} - -static BOOL DeleteFileA(LPCSTR lpFileName) -{ - PRUnichar wFileName[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, lpFileName, -1, wFileName, MAX_PATH); - return DeleteFileW(wFileName); -} - -static BOOL MoveFileA(LPCSTR from, LPCSTR to) -{ - PRUnichar wFrom[MAX_PATH]; - PRUnichar wTo[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, from, -1, wFrom, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, to, -1, wTo, MAX_PATH); - return MoveFileW(wFrom, wTo); -} - -static BOOL CreateDirectoryA(LPCSTR lpPathName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) -{ - PRUnichar wPathName[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, lpPathName, -1, wPathName, MAX_PATH); - return CreateDirectoryW(wPathName, lpSecurityAttributes); -} - -static BOOL RemoveDirectoryA(LPCSTR lpPathName) -{ - PRUnichar wPathName[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, lpPathName, -1, wPathName, MAX_PATH); - return RemoveDirectoryW(wPathName); -} - -static long GetDriveType(const char *lpRootPathName) -{ - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return 0; // The drive type cannot be determined. -} - -static DWORD GetFullPathName(const char *lpFileName, - DWORD nBufferLength, - const char *lpBuffer, - const char **lpFilePart) -{ - // needs work dft - DWORD len = strlen(lpFileName); - if (len > nBufferLength) - return len; - - strncpy((char *)lpBuffer, lpFileName, len); - ((char *)lpBuffer)[len] = '\0'; - - if (lpFilePart) { - char *sep = strrchr(lpBuffer, '\\'); - if (sep) { - sep++; // pass the seperator - *lpFilePart = sep; - } else { - *lpFilePart = lpBuffer; - } - } - return len; -} - -static BOOL LockFile(HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToLockLow, - DWORD nNumberOfBytesToLockHigh) -{ - OVERLAPPED overlapped = {0}; - overlapped.Offset = dwFileOffsetLow; - overlapped.OffsetHigh = dwFileOffsetHigh; - return LockFileEx(hFile, - LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, - 0, // reserved - nNumberOfBytesToLockLow, - nNumberOfBytesToLockHigh, &overlapped); -} - -static BOOL UnlockFile(HANDLE hFile, - DWORD dwFileOffsetLow, - DWORD dwFileOffsetHigh, - DWORD nNumberOfBytesToUnlockLow, - DWORD nNumberOfBytesToUnlockHigh) -{ - OVERLAPPED overlapped = {0}; - overlapped.Offset = dwFileOffsetLow; - overlapped.OffsetHigh = dwFileOffsetHigh; - return UnlockFileEx(hFile, - 0, // reserved - nNumberOfBytesToUnlockLow, - nNumberOfBytesToUnlockHigh, &overlapped); -} - -static unsigned char *_mbsdec(const unsigned char *string1, - const unsigned char *string2) -{ - // needs work dft - return NULL; -} - -static unsigned char *_mbsinc(const unsigned char *inCurrent) -{ - // needs work dft - return (unsigned char *)(inCurrent + 1); -} - -#endif - struct _MDLock _pr_ioq_lock; /* @@ -227,17 +36,6 @@ static DWORD dirAccessTable[] = { FILE_GENERIC_EXECUTE }; -/* Windows CE has GetFileAttributesEx. */ -#ifndef WINCE -typedef BOOL (WINAPI *GetFileAttributesExFn)(LPCTSTR, - GET_FILEEX_INFO_LEVELS, - LPVOID); -static GetFileAttributesExFn getFileAttributesEx; -static void InitGetFileInfo(void); -#endif - -static void InitUnicodeSupport(void); - static PRBool IsPrevCharSlash(const char *str, const char *current); void @@ -277,12 +75,6 @@ _PR_MD_INIT_IO() _PR_NT_InitSids(); -#ifndef WINCE - InitGetFileInfo(); -#endif - - InitUnicodeSupport(); - _PR_MD_InitSockets(); } @@ -795,11 +587,6 @@ _PR_FileTimeToPRTime(const FILETIME *filetime, PRTime *prtm) PRInt32 _PR_MD_STAT(const char *fn, struct stat *info) { -#ifdef WINCE - // needs work. dft - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return -1; -#else PRInt32 rv; rv = _stat(fn, (struct _stat *)info); @@ -831,7 +618,6 @@ _PR_MD_STAT(const char *fn, struct stat *info) _PR_MD_MAP_STAT_ERROR(errno); } return rv; -#endif } #define _PR_IS_SLASH(ch) ((ch) == '/' || (ch) == '\\') @@ -935,117 +721,10 @@ IsRootDirectory(char *fn, size_t buflen) return rv; } -#ifndef WINCE -/* - * InitGetFileInfo -- - * - * Called during IO init. Checks for the existence of the system function - * GetFileAttributeEx, which when available is used in GETFILEINFO calls. - * If the routine exists, then the address of the routine is stored in the - * variable getFileAttributesEx, which will be used to call the routine. - */ -static void InitGetFileInfo(void) -{ - HMODULE module; - module = GetModuleHandle("Kernel32.dll"); - if (!module) { - PR_LOG(_pr_io_lm, PR_LOG_DEBUG, - ("InitGetFileInfo: GetModuleHandle() failed: %d", - GetLastError())); - return; - } - - getFileAttributesEx = (GetFileAttributesExFn) - GetProcAddress(module, "GetFileAttributesExA"); -} - -/* - * If GetFileAttributeEx doesn't exist, we call FindFirstFile as a - * fallback. - */ -static BOOL -GetFileAttributesExFB(const char *fn, WIN32_FIND_DATA *findFileData) -{ - HANDLE hFindFile; - - /* - * FindFirstFile() expands wildcard characters. So - * we make sure the pathname contains no wildcard. - */ - if (NULL != _mbspbrk(fn, "?*")) { - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - - hFindFile = FindFirstFile(fn, findFileData); - if (INVALID_HANDLE_VALUE == hFindFile) { - DWORD len; - char *filePart; - char pathbuf[MAX_PATH + 1]; - - /* - * FindFirstFile() does not work correctly on root directories. - * It also doesn't work correctly on a pathname that ends in a - * slash. So we first check to see if the pathname specifies a - * root directory. If not, and if the pathname ends in a slash, - * we remove the final slash and try again. - */ - - /* - * If the pathname does not contain ., \, and /, it cannot be - * a root directory or a pathname that ends in a slash. - */ - if (NULL == _mbspbrk(fn, ".\\/")) { - return FALSE; - } - len = GetFullPathName(fn, sizeof(pathbuf), pathbuf, - &filePart); - if (0 == len) { - return FALSE; - } - if (len > sizeof(pathbuf)) { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; - } - if (IsRootDirectory(pathbuf, sizeof(pathbuf))) { - findFileData->dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; - /* The file size doesn't have a meaning for directories. */ - findFileData->nFileSizeHigh = 0; - findFileData->nFileSizeLow = 0; - /* - * For a directory, these timestamps all specify when the - * directory is created. The creation time doesn't make - * sense for root directories, so we set it to (NSPR) time 0. - */ - memcpy(&findFileData->ftCreationTime, &_pr_filetime_offset, 8); - findFileData->ftLastAccessTime = findFileData->ftCreationTime; - findFileData->ftLastWriteTime = findFileData->ftCreationTime; - return TRUE; - } - if (!IsPrevCharSlash(pathbuf, pathbuf + len)) { - return FALSE; - } else { - pathbuf[len - 1] = '\0'; - hFindFile = FindFirstFile(pathbuf, findFileData); - if (INVALID_HANDLE_VALUE == hFindFile) { - return FALSE; - } - } - } - - FindClose(hFindFile); - return TRUE; -} -#endif - PRInt32 _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info) { -#ifdef WINCE WIN32_FILE_ATTRIBUTE_DATA findFileData; -#else - WIN32_FIND_DATA findFileData; -#endif BOOL rv; if (NULL == fn || '\0' == *fn) { @@ -1053,16 +732,7 @@ _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info) return -1; } -#ifdef WINCE - rv = GetFileAttributesExA(fn, GetFileExInfoStandard, &findFileData); -#else - /* GetFileAttributesEx is supported on Win 2K and up. */ - if (getFileAttributesEx) { - rv = getFileAttributesEx(fn, GetFileExInfoStandard, &findFileData); - } else { - rv = GetFileAttributesExFB(fn, &findFileData); - } -#endif + rv = GetFileAttributesEx(fn, GetFileExInfoStandard, &findFileData); if (!rv) { _PR_MD_MAP_OPENDIR_ERROR(GetLastError()); return -1; @@ -1150,10 +820,6 @@ _PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info) PRStatus _PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable) { -#ifdef WINCE - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return PR_FAILURE; -#else BOOL rv; /* @@ -1169,7 +835,6 @@ _PR_MD_SET_FD_INHERITABLE(PRFileDesc *fd, PRBool inheritable) return PR_FAILURE; } return PR_SUCCESS; -#endif } void @@ -1185,9 +850,6 @@ _PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported) void _PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd) { -#ifdef WINCE - fd->secret->inheritable = _PR_TRI_FALSE; -#else DWORD flags; PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable); @@ -1198,7 +860,6 @@ _PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd) fd->secret->inheritable = _PR_TRI_FALSE; } } -#endif } PRInt32 @@ -1216,10 +877,6 @@ _PR_MD_RENAME(const char *from, const char *to) PRInt32 _PR_MD_ACCESS(const char *name, PRAccessHow how) { -#ifdef WINCE - PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0); - return -1; -#else PRInt32 rv; switch (how) { case PR_ACCESS_WRITE_OK: @@ -1238,7 +895,6 @@ PRInt32 rv; if (rv < 0) _PR_MD_MAP_ACCESS_ERROR(errno); return rv; -#endif } PRInt32 @@ -1364,40 +1020,6 @@ static GetDriveTypeWFn getDriveTypeW = GetDriveTypeW; #endif /* MOZ_UNICODE */ -PRBool _pr_useUnicode = PR_FALSE; - -static void InitUnicodeSupport(void) -{ -#ifdef WINCE - /* The A functions don't even exist in Windows Mobile. */ - _pr_useUnicode = PR_TRUE; -#else - /* - * The W functions exist on Win9x as stubs that fail with the - * ERROR_CALL_NOT_IMPLEMENTED error. We plan to emulate the - * MSLU W functions on Win9x in the future. - */ - - /* Find out if we are running on a Unicode enabled version of Windows */ - OSVERSIONINFOA osvi = {0}; - - osvi.dwOSVersionInfoSize = sizeof(osvi); - if (GetVersionExA(&osvi)) { - _pr_useUnicode = (osvi.dwPlatformId >= VER_PLATFORM_WIN32_NT); - } else { - _pr_useUnicode = PR_FALSE; - } -#ifdef DEBUG - /* - * In debug builds, allow explicit use of ANSI methods to simulate - * a Win9x environment for testing purposes. - */ - if (getenv("WINAPI_USE_ANSI")) - _pr_useUnicode = PR_FALSE; -#endif -#endif -} - #ifdef MOZ_UNICODE /* ================ UTF16 Interfaces ================================ */ diff --git a/mozilla/nsprpub/pr/src/md/windows/w95sock.c b/nspr/pr/src/md/windows/w95sock.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w95sock.c rename to nspr/pr/src/md/windows/w95sock.c diff --git a/mozilla/nsprpub/pr/src/md/windows/w95thred.c b/nspr/pr/src/md/windows/w95thred.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/w95thred.c rename to nspr/pr/src/md/windows/w95thred.c diff --git a/mozilla/nsprpub/pr/src/md/windows/win32_errors.c b/nspr/pr/src/md/windows/win32_errors.c similarity index 100% rename from mozilla/nsprpub/pr/src/md/windows/win32_errors.c rename to nspr/pr/src/md/windows/win32_errors.c diff --git a/mozilla/nsprpub/pr/include/.cvsignore b/nspr/pr/src/memory/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/include/.cvsignore rename to nspr/pr/src/memory/.cvsignore diff --git a/mozilla/nsprpub/pr/src/memory/Makefile.in b/nspr/pr/src/memory/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/memory/Makefile.in rename to nspr/pr/src/memory/Makefile.in diff --git a/mozilla/nsprpub/pr/src/memory/prseg.c b/nspr/pr/src/memory/prseg.c similarity index 100% rename from mozilla/nsprpub/pr/src/memory/prseg.c rename to nspr/pr/src/memory/prseg.c diff --git a/mozilla/nsprpub/pr/src/memory/prshm.c b/nspr/pr/src/memory/prshm.c similarity index 100% rename from mozilla/nsprpub/pr/src/memory/prshm.c rename to nspr/pr/src/memory/prshm.c diff --git a/mozilla/nsprpub/pr/src/memory/prshma.c b/nspr/pr/src/memory/prshma.c similarity index 100% rename from mozilla/nsprpub/pr/src/memory/prshma.c rename to nspr/pr/src/memory/prshma.c diff --git a/mozilla/nsprpub/pr/.cvsignore b/nspr/pr/src/misc/.cvsignore similarity index 100% rename from mozilla/nsprpub/pr/.cvsignore rename to nspr/pr/src/misc/.cvsignore diff --git a/mozilla/nsprpub/pr/src/misc/Makefile.in b/nspr/pr/src/misc/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/misc/Makefile.in rename to nspr/pr/src/misc/Makefile.in diff --git a/mozilla/nsprpub/pr/src/misc/compile-et.pl b/nspr/pr/src/misc/compile-et.pl similarity index 100% rename from mozilla/nsprpub/pr/src/misc/compile-et.pl rename to nspr/pr/src/misc/compile-et.pl diff --git a/mozilla/nsprpub/pr/src/misc/dtoa.c b/nspr/pr/src/misc/dtoa.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/dtoa.c rename to nspr/pr/src/misc/dtoa.c diff --git a/mozilla/nsprpub/pr/src/misc/pralarm.c b/nspr/pr/src/misc/pralarm.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/pralarm.c rename to nspr/pr/src/misc/pralarm.c diff --git a/mozilla/nsprpub/pr/src/misc/pratom.c b/nspr/pr/src/misc/pratom.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/pratom.c rename to nspr/pr/src/misc/pratom.c diff --git a/mozilla/nsprpub/pr/src/misc/praton.c b/nspr/pr/src/misc/praton.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/praton.c rename to nspr/pr/src/misc/praton.c diff --git a/mozilla/nsprpub/pr/src/misc/prcountr.c b/nspr/pr/src/misc/prcountr.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prcountr.c rename to nspr/pr/src/misc/prcountr.c diff --git a/mozilla/nsprpub/pr/src/misc/prdtoa.c b/nspr/pr/src/misc/prdtoa.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prdtoa.c rename to nspr/pr/src/misc/prdtoa.c diff --git a/mozilla/nsprpub/pr/src/misc/prenv.c b/nspr/pr/src/misc/prenv.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prenv.c rename to nspr/pr/src/misc/prenv.c diff --git a/mozilla/nsprpub/pr/src/misc/prerr.c b/nspr/pr/src/misc/prerr.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prerr.c rename to nspr/pr/src/misc/prerr.c diff --git a/mozilla/nsprpub/pr/src/misc/prerr.et b/nspr/pr/src/misc/prerr.et similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prerr.et rename to nspr/pr/src/misc/prerr.et diff --git a/mozilla/nsprpub/pr/src/misc/prerr.properties b/nspr/pr/src/misc/prerr.properties similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prerr.properties rename to nspr/pr/src/misc/prerr.properties diff --git a/mozilla/nsprpub/pr/src/misc/prerror.c b/nspr/pr/src/misc/prerror.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prerror.c rename to nspr/pr/src/misc/prerror.c diff --git a/mozilla/nsprpub/pr/src/misc/prerrortable.c b/nspr/pr/src/misc/prerrortable.c similarity index 98% rename from mozilla/nsprpub/pr/src/misc/prerrortable.c rename to nspr/pr/src/misc/prerrortable.c index 48be3f5..285fde9 100644 --- a/mozilla/nsprpub/pr/src/misc/prerrortable.c +++ b/nspr/pr/src/misc/prerrortable.c @@ -25,9 +25,6 @@ provided "as is" without express or implied warranty. */ #include -#ifdef SUNOS4 -#include "md/sunos4.h" /* for strerror */ -#endif #include #include #include "prmem.h" diff --git a/mozilla/nsprpub/pr/src/misc/prinit.c b/nspr/pr/src/misc/prinit.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prinit.c rename to nspr/pr/src/misc/prinit.c diff --git a/mozilla/nsprpub/pr/src/misc/prinrval.c b/nspr/pr/src/misc/prinrval.c similarity index 92% rename from mozilla/nsprpub/pr/src/misc/prinrval.c rename to nspr/pr/src/misc/prinrval.c index b404356..50a938b 100644 --- a/mozilla/nsprpub/pr/src/misc/prinrval.c +++ b/nspr/pr/src/misc/prinrval.c @@ -32,13 +32,6 @@ void _PR_InitClock(void) #endif /* DEBUG */ } -/* - * This version of interval times is based on the time of day - * capability offered by system. This isn't valid for two reasons: - * 1) The time of day is neither linear nor montonically increasing - * 2) The units here are milliseconds. That's not appropriate for our use. - */ - PR_IMPLEMENT(PRIntervalTime) PR_IntervalNow(void) { if (!_pr_initialized) _PR_ImplicitInitialization(); diff --git a/mozilla/nsprpub/pr/src/misc/pripc.c b/nspr/pr/src/misc/pripc.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/pripc.c rename to nspr/pr/src/misc/pripc.c diff --git a/mozilla/nsprpub/pr/src/misc/pripcsem.c b/nspr/pr/src/misc/pripcsem.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/pripcsem.c rename to nspr/pr/src/misc/pripcsem.c diff --git a/mozilla/nsprpub/pr/src/misc/prlog2.c b/nspr/pr/src/misc/prlog2.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prlog2.c rename to nspr/pr/src/misc/prlog2.c diff --git a/mozilla/nsprpub/pr/src/misc/prlong.c b/nspr/pr/src/misc/prlong.c similarity index 99% rename from mozilla/nsprpub/pr/src/misc/prlong.c rename to nspr/pr/src/misc/prlong.c index 630b2a8..701d081 100644 --- a/mozilla/nsprpub/pr/src/misc/prlong.c +++ b/nspr/pr/src/misc/prlong.c @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "primpl.h" +#include "prlong.h" static PRInt64 ll_zero = LL_INIT( 0x00000000,0x00000000 ); static PRInt64 ll_maxint = LL_INIT( 0x7fffffff, 0xffffffff ); diff --git a/mozilla/nsprpub/pr/src/misc/prnetdb.c b/nspr/pr/src/misc/prnetdb.c similarity index 99% rename from mozilla/nsprpub/pr/src/misc/prnetdb.c rename to nspr/pr/src/misc/prnetdb.c index d668550..7d05e57 100644 --- a/mozilla/nsprpub/pr/src/misc/prnetdb.c +++ b/nspr/pr/src/misc/prnetdb.c @@ -1998,7 +1998,7 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const char *hostname, #endif { PRADDRINFO *res, hints; - PRStatus rv; + int rv; /* * we assume a RFC 2553 compliant getaddrinfo. this may at some @@ -2263,7 +2263,7 @@ static PRStatus pr_NetAddrToStringGNI( md_af = AF_INET6; #ifndef _PR_HAVE_SOCKADDR_LEN addrcopy = *addr; - addrcopy.raw.family = AF_INET6; + addrcopy.raw.family = md_af; addrp = &addrcopy; #endif } diff --git a/mozilla/nsprpub/pr/src/misc/prolock.c b/nspr/pr/src/misc/prolock.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prolock.c rename to nspr/pr/src/misc/prolock.c diff --git a/mozilla/nsprpub/pr/src/misc/prrng.c b/nspr/pr/src/misc/prrng.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prrng.c rename to nspr/pr/src/misc/prrng.c diff --git a/mozilla/nsprpub/pr/src/misc/prsystem.c b/nspr/pr/src/misc/prsystem.c similarity index 87% rename from mozilla/nsprpub/pr/src/misc/prsystem.c rename to nspr/pr/src/misc/prsystem.c index f79d588..9579fcc 100644 --- a/mozilla/nsprpub/pr/src/misc/prsystem.c +++ b/nspr/pr/src/misc/prsystem.c @@ -56,24 +56,6 @@ #include #endif -#if defined(WIN32) -/* This struct is not present in VC6 headers, so declare it here */ -typedef struct { - DWORD dwLength; - DWORD dwMemoryLoad; - DWORDLONG ullTotalPhys; - DWORDLONG ullAvailPhys; - DWORDLONG ullToalPageFile; - DWORDLONG ullAvailPageFile; - DWORDLONG ullTotalVirtual; - DWORDLONG ullAvailVirtual; - DWORDLONG ullAvailExtendedVirtual; -} PR_MEMORYSTATUSEX; - -/* Typedef for dynamic lookup of GlobalMemoryStatusEx(). */ -typedef BOOL (WINAPI *GlobalMemoryStatusExFn)(PR_MEMORYSTATUSEX *); -#endif - PR_IMPLEMENT(char) PR_GetDirectorySeparator(void) { return PR_DIRECTORY_SEPARATOR; @@ -327,29 +309,10 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void) #elif defined(WIN32) - /* Try to use the newer GlobalMemoryStatusEx API for Windows 2000+. */ - GlobalMemoryStatusExFn globalMemory = (GlobalMemoryStatusExFn) NULL; - HMODULE module = GetModuleHandleW(L"kernel32.dll"); - - if (module) { - globalMemory = (GlobalMemoryStatusExFn)GetProcAddress(module, "GlobalMemoryStatusEx"); - - if (globalMemory) { - PR_MEMORYSTATUSEX memStat; - memStat.dwLength = sizeof(memStat); - - if (globalMemory(&memStat)) - bytes = memStat.ullTotalPhys; - } - } - - if (!bytes) { - /* Fall back to the older API. */ - MEMORYSTATUS memStat; - memset(&memStat, 0, sizeof(memStat)); - GlobalMemoryStatus(&memStat); - bytes = memStat.dwTotalPhys; - } + MEMORYSTATUSEX memStat; + memStat.dwLength = sizeof(memStat); + if (GlobalMemoryStatusEx(&memStat)) + bytes = memStat.ullTotalPhys; #elif defined(OS2) diff --git a/mozilla/nsprpub/pr/src/misc/prthinfo.c b/nspr/pr/src/misc/prthinfo.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prthinfo.c rename to nspr/pr/src/misc/prthinfo.c diff --git a/mozilla/nsprpub/pr/src/misc/prtime.c b/nspr/pr/src/misc/prtime.c similarity index 99% rename from mozilla/nsprpub/pr/src/misc/prtime.c rename to nspr/pr/src/misc/prtime.c index 93d227a..95d034c 100644 --- a/mozilla/nsprpub/pr/src/misc/prtime.c +++ b/nspr/pr/src/misc/prtime.c @@ -1695,7 +1695,7 @@ PR_FormatTime(char *buf, int buflen, const char *fmt, const PRExplodedTime *tm) * additional fields: tm_zone and tm_gmtoff. */ -#if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \ +#if (__GLIBC__ >= 2) || defined(XP_BEOS) \ || defined(NETBSD) || defined(OPENBSD) || defined(FREEBSD) \ || defined(DARWIN) || defined(SYMBIAN) || defined(ANDROID) a.tm_zone = NULL; diff --git a/mozilla/nsprpub/pr/src/misc/prtpool.c b/nspr/pr/src/misc/prtpool.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prtpool.c rename to nspr/pr/src/misc/prtpool.c diff --git a/mozilla/nsprpub/pr/src/misc/prtrace.c b/nspr/pr/src/misc/prtrace.c similarity index 100% rename from mozilla/nsprpub/pr/src/misc/prtrace.c rename to nspr/pr/src/misc/prtrace.c diff --git a/mozilla/nsprpub/pr/src/nspr.def b/nspr/pr/src/nspr.def similarity index 100% rename from mozilla/nsprpub/pr/src/nspr.def rename to nspr/pr/src/nspr.def diff --git a/mozilla/nsprpub/pr/src/nspr.rc b/nspr/pr/src/nspr.rc similarity index 100% rename from mozilla/nsprpub/pr/src/nspr.rc rename to nspr/pr/src/nspr.rc diff --git a/mozilla/nsprpub/pr/src/os2extra.def b/nspr/pr/src/os2extra.def similarity index 100% rename from mozilla/nsprpub/pr/src/os2extra.def rename to nspr/pr/src/os2extra.def diff --git a/mozilla/nsprpub/pr/src/prvrsion.c b/nspr/pr/src/prvrsion.c similarity index 100% rename from mozilla/nsprpub/pr/src/prvrsion.c rename to nspr/pr/src/prvrsion.c diff --git a/mozilla/nsprpub/lib/tests/.cvsignore b/nspr/pr/src/pthreads/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/tests/.cvsignore rename to nspr/pr/src/pthreads/.cvsignore diff --git a/mozilla/nsprpub/pr/src/pthreads/Makefile.in b/nspr/pr/src/pthreads/Makefile.in similarity index 83% rename from mozilla/nsprpub/pr/src/pthreads/Makefile.in rename to nspr/pr/src/pthreads/Makefile.in index d0dcdbc..c8191c7 100644 --- a/mozilla/nsprpub/pr/src/pthreads/Makefile.in +++ b/nspr/pr/src/pthreads/Makefile.in @@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - CSRCS = \ ptio.c \ ptsynch.c \ diff --git a/mozilla/nsprpub/pr/src/pthreads/ptio.c b/nspr/pr/src/pthreads/ptio.c similarity index 99% rename from mozilla/nsprpub/pr/src/pthreads/ptio.c rename to nspr/pr/src/pthreads/ptio.c index 928f80a..abf61d5 100644 --- a/mozilla/nsprpub/pr/src/pthreads/ptio.c +++ b/nspr/pr/src/pthreads/ptio.c @@ -1150,7 +1150,7 @@ void _PR_InitIO(void) osfd = socket(AF_INET6, SOCK_STREAM, 0); if (osfd != -1) { int on; - int optlen = sizeof(on); + socklen_t optlen = sizeof(on); if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY, &on, &optlen) == 0) { _pr_ipv6_v6only_on_by_default = on; @@ -4850,7 +4850,7 @@ PR_IMPLEMENT(PRInt32) PR_FD_NISSET(PRInt32 fd, PR_fd_set *set) #include #include -#if !defined(SUNOS4) && !defined(HPUX) \ +#if !defined(HPUX) \ && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) #include #endif diff --git a/mozilla/nsprpub/pr/src/pthreads/ptmisc.c b/nspr/pr/src/pthreads/ptmisc.c similarity index 100% rename from mozilla/nsprpub/pr/src/pthreads/ptmisc.c rename to nspr/pr/src/pthreads/ptmisc.c diff --git a/mozilla/nsprpub/pr/src/pthreads/ptsynch.c b/nspr/pr/src/pthreads/ptsynch.c similarity index 100% rename from mozilla/nsprpub/pr/src/pthreads/ptsynch.c rename to nspr/pr/src/pthreads/ptsynch.c diff --git a/mozilla/nsprpub/pr/src/pthreads/ptthread.c b/nspr/pr/src/pthreads/ptthread.c similarity index 95% rename from mozilla/nsprpub/pr/src/pthreads/ptthread.c rename to nspr/pr/src/pthreads/ptthread.c index d78dafa..764ec2c 100644 --- a/mozilla/nsprpub/pr/src/pthreads/ptthread.c +++ b/nspr/pr/src/pthreads/ptthread.c @@ -28,6 +28,14 @@ #undef _POSIX_THREAD_PRIORITY_SCHEDULING #endif +#ifdef _PR_NICE_PRIORITY_SCHEDULING +#undef _POSIX_THREAD_PRIORITY_SCHEDULING +#include +#ifndef HAVE_GETTID +#define gettid() (syscall(SYS_gettid)) +#endif +#endif + /* * Record whether or not we have the privilege to set the scheduling * policy and priority of threads. 0 means that privilege is available. @@ -43,7 +51,7 @@ static struct _PT_Bookeeping PRCondVar *cv; /* used to signal global things */ PRInt32 system, user; /* a count of the two different types */ PRUintn this_many; /* number of threads allowed for exit */ - pthread_key_t key; /* private private data key */ + pthread_key_t key; /* thread private data key */ PRThread *first, *last; /* list of threads we know about */ #if defined(_PR_DCETHREADS) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING) PRInt32 minPrio, maxPrio; /* range of scheduling priorities */ @@ -69,6 +77,21 @@ static PRIntn pt_PriorityMap(PRThreadPriority pri) pri * (pt_book.maxPrio - pt_book.minPrio) / PR_PRIORITY_LAST; #endif } +#elif defined(_PR_NICE_PRIORITY_SCHEDULING) +/* + * This functions maps higher priorities to lower nice values relative to the + * nice value specified in the |nice| parameter. The corresponding relative + * adjustments are: + * + * PR_PRIORITY_LOW +1 + * PR_PRIORITY_NORMAL 0 + * PR_PRIORITY_HIGH -1 + * PR_PRIORITY_URGENT -2 + */ +static int pt_RelativePriority(int nice, PRThreadPriority pri) +{ + return nice + (1 - pri); +} #endif /* @@ -98,6 +121,9 @@ static void *_pt_root(void *arg) PRIntn rv; PRThread *thred = (PRThread*)arg; PRBool detached = (thred->state & PT_THREAD_DETACHED) ? PR_TRUE : PR_FALSE; +#ifdef _PR_NICE_PRIORITY_SCHEDULING + pid_t tid; +#endif /* * Both the parent thread and this new thread set thred->id. @@ -110,6 +136,28 @@ static void *_pt_root(void *arg) */ thred->id = pthread_self(); +#ifdef _PR_NICE_PRIORITY_SCHEDULING + /* + * We need to know the kernel thread ID of each thread in order to + * set its nice value hence we do it here instead of at creation time. + */ + tid = gettid(); + errno = 0; + rv = getpriority(PRIO_PROCESS, 0); + + /* If we cannot read the main thread's nice value don't try to change the + * new thread's nice value. */ + if (errno == 0) { + setpriority(PRIO_PROCESS, tid, + pt_RelativePriority(rv, thred->priority)); + } + + PR_Lock(pt_book.ml); + thred->tid = tid; + PR_NotifyAllCondVar(pt_book.cv); + PR_Unlock(pt_book.ml); +#endif + /* ** DCE Threads can't detach during creation, so do it late. ** I would like to do it only here, but that doesn't seem @@ -224,6 +272,9 @@ static PRThread* pt_AttachThread(void) thred->priority = PR_PRIORITY_NORMAL; thred->id = pthread_self(); +#ifdef _PR_NICE_PRIORITY_SCHEDULING + thred->tid = gettid(); +#endif rv = pthread_setspecific(pt_book.key, thred); PR_ASSERT(0 == rv); @@ -644,6 +695,30 @@ PR_IMPLEMENT(void) PR_SetThreadPriority(PRThread *thred, PRThreadPriority newPri if (rv != 0) rv = -1; } +#elif defined(_PR_NICE_PRIORITY_SCHEDULING) + PR_Lock(pt_book.ml); + while (thred->tid == 0) + PR_WaitCondVar(pt_book.cv, PR_INTERVAL_NO_TIMEOUT); + PR_Unlock(pt_book.ml); + + errno = 0; + rv = getpriority(PRIO_PROCESS, 0); + + /* Do not proceed unless we know the main thread's nice value. */ + if (errno == 0) { + rv = setpriority(PRIO_PROCESS, thred->tid, + pt_RelativePriority(rv, newPri)); + + if (rv == -1) + { + /* We don't set pt_schedpriv to EPERM in case errno == EPERM + * because adjusting the nice value might be permitted for certain + * ranges but not for others. */ + PR_LOG(_pr_thread_lm, PR_LOG_MIN, + ("PR_SetThreadPriority: setpriority failed with error %d", + errno)); + } + } #endif thred->priority = newPri; @@ -816,6 +891,8 @@ void _PR_InitThreads( int rv; PRThread *thred; + PR_ASSERT(priority == PR_PRIORITY_NORMAL); + #ifdef _PR_NEED_PTHREAD_INIT /* * On BSD/OS (3.1 and 4.0), the pthread subsystem is lazily @@ -862,6 +939,9 @@ void _PR_InitThreads( thred->startFunc = NULL; thred->priority = priority; thred->id = pthread_self(); +#ifdef _PR_NICE_PRIORITY_SCHEDULING + thred->tid = gettid(); +#endif thred->state = (PT_THREAD_DETACHED | PT_THREAD_PRIMORD); if (PR_SYSTEM_THREAD == type) @@ -902,7 +982,6 @@ void _PR_InitThreads( PR_ASSERT(0 == rv); rv = pthread_setspecific(pt_book.key, thred); PR_ASSERT(0 == rv); - PR_SetThreadPriority(thred, priority); } /* _PR_InitThreads */ #ifdef __GNUC__ @@ -975,6 +1054,8 @@ void _PR_Fini(void) rv = pthread_setspecific(pt_book.key, NULL); PR_ASSERT(0 == rv); } + rv = pthread_key_delete(pt_book.key); + PR_ASSERT(0 == rv); /* TODO: free other resources used by NSPR */ /* _pr_initialized = PR_FALSE; */ } /* _PR_Fini */ diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore b/nspr/pr/src/threads/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore rename to nspr/pr/src/threads/.cvsignore diff --git a/mozilla/nsprpub/pr/src/threads/Makefile.in b/nspr/pr/src/threads/Makefile.in similarity index 100% rename from mozilla/nsprpub/pr/src/threads/Makefile.in rename to nspr/pr/src/threads/Makefile.in diff --git a/mozilla/nsprpub/lib/prstreams/.cvsignore b/nspr/pr/src/threads/combined/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/prstreams/.cvsignore rename to nspr/pr/src/threads/combined/.cvsignore diff --git a/mozilla/nsprpub/pr/src/threads/combined/Makefile.in b/nspr/pr/src/threads/combined/Makefile.in similarity index 85% rename from mozilla/nsprpub/pr/src/threads/combined/Makefile.in rename to nspr/pr/src/threads/combined/Makefile.in index 91022f8..14b9eac 100644 --- a/mozilla/nsprpub/pr/src/threads/combined/Makefile.in +++ b/nspr/pr/src/threads/combined/Makefile.in @@ -15,13 +15,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - ifdef USE_PTHREADS CSRCS = \ $(NULL) diff --git a/mozilla/nsprpub/pr/src/threads/combined/README b/nspr/pr/src/threads/combined/README similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/README rename to nspr/pr/src/threads/combined/README diff --git a/mozilla/nsprpub/pr/src/threads/combined/prucpu.c b/nspr/pr/src/threads/combined/prucpu.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/prucpu.c rename to nspr/pr/src/threads/combined/prucpu.c diff --git a/mozilla/nsprpub/pr/src/threads/combined/prucv.c b/nspr/pr/src/threads/combined/prucv.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/prucv.c rename to nspr/pr/src/threads/combined/prucv.c diff --git a/mozilla/nsprpub/pr/src/threads/combined/prulock.c b/nspr/pr/src/threads/combined/prulock.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/prulock.c rename to nspr/pr/src/threads/combined/prulock.c diff --git a/mozilla/nsprpub/pr/src/threads/combined/prustack.c b/nspr/pr/src/threads/combined/prustack.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/combined/prustack.c rename to nspr/pr/src/threads/combined/prustack.c diff --git a/mozilla/nsprpub/pr/src/threads/combined/pruthr.c b/nspr/pr/src/threads/combined/pruthr.c similarity index 99% rename from mozilla/nsprpub/pr/src/threads/combined/pruthr.c rename to nspr/pr/src/threads/combined/pruthr.c index 7ecccf5..825ed89 100644 --- a/mozilla/nsprpub/pr/src/threads/combined/pruthr.c +++ b/nspr/pr/src/threads/combined/pruthr.c @@ -65,6 +65,8 @@ void _PR_InitThreads(PRThreadType type, PRThreadPriority priority, PRThread *thread; PRThreadStack *stack; + PR_ASSERT(priority == PR_PRIORITY_NORMAL); + _pr_terminationCVLock = PR_NewLock(); _pr_activeLock = PR_NewLock(); diff --git a/mozilla/nsprpub/pr/src/threads/prcmon.c b/nspr/pr/src/threads/prcmon.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prcmon.c rename to nspr/pr/src/threads/prcmon.c diff --git a/mozilla/nsprpub/pr/src/threads/prcthr.c b/nspr/pr/src/threads/prcthr.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prcthr.c rename to nspr/pr/src/threads/prcthr.c diff --git a/mozilla/nsprpub/pr/src/threads/prdump.c b/nspr/pr/src/threads/prdump.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prdump.c rename to nspr/pr/src/threads/prdump.c diff --git a/mozilla/nsprpub/pr/src/threads/prmon.c b/nspr/pr/src/threads/prmon.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prmon.c rename to nspr/pr/src/threads/prmon.c diff --git a/mozilla/nsprpub/pr/src/threads/prrwlock.c b/nspr/pr/src/threads/prrwlock.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prrwlock.c rename to nspr/pr/src/threads/prrwlock.c diff --git a/mozilla/nsprpub/pr/src/threads/prsem.c b/nspr/pr/src/threads/prsem.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prsem.c rename to nspr/pr/src/threads/prsem.c diff --git a/mozilla/nsprpub/pr/src/threads/prtpd.c b/nspr/pr/src/threads/prtpd.c similarity index 100% rename from mozilla/nsprpub/pr/src/threads/prtpd.c rename to nspr/pr/src/threads/prtpd.c diff --git a/mozilla/nsprpub/lib/libc/include/.cvsignore b/nspr/pr/tests/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/libc/include/.cvsignore rename to nspr/pr/tests/.cvsignore diff --git a/mozilla/nsprpub/pr/tests/Makefile.in b/nspr/pr/tests/Makefile.in similarity index 84% rename from mozilla/nsprpub/pr/tests/Makefile.in rename to nspr/pr/tests/Makefile.in index 122ef1c..50e8776 100644 --- a/mozilla/nsprpub/pr/tests/Makefile.in +++ b/nspr/pr/tests/Makefile.in @@ -114,6 +114,7 @@ CSRCS = \ provider.c \ prpoll.c \ prpollml.c \ + pushtop.c \ ranfile.c \ randseed.c \ reinit.c \ @@ -295,15 +296,13 @@ endif # Solaris ifeq ($(OS_ARCH), SunOS) - ifneq ($(OS_RELEASE), 4.1.3_U1) - ifdef NS_USE_GCC - LDOPTS += -Xlinker -R -Xlinker $(ABSOLUTE_LIB_DIR) - else - ifeq ($(USE_CPLUS), 1) - CC = CC - endif - LDOPTS += -R $(ABSOLUTE_LIB_DIR) + ifdef NS_USE_GCC + LDOPTS += -Xlinker -R -Xlinker $(ABSOLUTE_LIB_DIR) + else + ifeq ($(USE_CPLUS), 1) + CC = CC endif + LDOPTS += -R $(ABSOLUTE_LIB_DIR) endif ifdef USE_PTHREADS @@ -311,41 +310,6 @@ ifeq ($(OS_ARCH), SunOS) endif endif # SunOS -ifeq ($(OS_ARCH), NEC) - EXTRA_LIBS = $(OS_LIBS) -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. - export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) -endif - -ifeq ($(OS_ARCH), NCR) -# NCR needs to link against -lsocket -lnsl -ldl (and -lc, which is -# linked implicitly by $(CC)). Note that we did not link with these -# system libraries when we built libnspr.so. - EXTRA_LIBS = -lsocket -lnsl -ldl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. - export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) -endif - -ifeq ($(OS_ARCH), NEXTSTEP) -# balazs.pataki@sztaki.hu: linkage is done in a different pass in the `tests' -# modeul, so we have to pass the `-posix' flag by "hand" to `ld' -LDOPTS += -posix -endif - -ifeq ($(OS_ARCH), NEWS-OS) -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) - LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a - LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a - EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv -endif - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) ifeq ($(USE_PTHREADS),1) @@ -363,14 +327,6 @@ EXTRA_LIBS = -lsocket export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) endif -ifeq ($(OS_ARCH),SINIX) -EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) -endif - ifeq ($(OS_ARCH),OpenUNIX) export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) ifeq ($(USE_PTHREADS),1) @@ -483,7 +439,6 @@ clean:: # The following tests call BSD socket functions, so they need to link # with -lsocket on some platforms. ifeq ($(OS_ARCH),SunOS) -ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(USE_IPV6),1) $(OBJDIR)/gethost: $(OBJDIR)/gethost.o $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ @@ -491,7 +446,6 @@ endif $(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ endif -endif ifeq ($(USE_PTHREADS), 1) $(OBJDIR)/attach: $(OBJDIR)/attach.o diff --git a/mozilla/nsprpub/pr/tests/README.TXT b/nspr/pr/tests/README.TXT similarity index 100% rename from mozilla/nsprpub/pr/tests/README.TXT rename to nspr/pr/tests/README.TXT diff --git a/mozilla/nsprpub/pr/tests/accept.c b/nspr/pr/tests/accept.c similarity index 100% rename from mozilla/nsprpub/pr/tests/accept.c rename to nspr/pr/tests/accept.c diff --git a/mozilla/nsprpub/pr/tests/acceptread.c b/nspr/pr/tests/acceptread.c similarity index 100% rename from mozilla/nsprpub/pr/tests/acceptread.c rename to nspr/pr/tests/acceptread.c diff --git a/mozilla/nsprpub/pr/tests/acceptreademu.c b/nspr/pr/tests/acceptreademu.c similarity index 100% rename from mozilla/nsprpub/pr/tests/acceptreademu.c rename to nspr/pr/tests/acceptreademu.c diff --git a/mozilla/nsprpub/pr/tests/addrstr.c b/nspr/pr/tests/addrstr.c similarity index 100% rename from mozilla/nsprpub/pr/tests/addrstr.c rename to nspr/pr/tests/addrstr.c diff --git a/mozilla/nsprpub/pr/tests/affinity.c b/nspr/pr/tests/affinity.c similarity index 100% rename from mozilla/nsprpub/pr/tests/affinity.c rename to nspr/pr/tests/affinity.c diff --git a/mozilla/nsprpub/pr/tests/alarm.c b/nspr/pr/tests/alarm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/alarm.c rename to nspr/pr/tests/alarm.c diff --git a/mozilla/nsprpub/pr/tests/anonfm.c b/nspr/pr/tests/anonfm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/anonfm.c rename to nspr/pr/tests/anonfm.c diff --git a/mozilla/nsprpub/pr/tests/append.c b/nspr/pr/tests/append.c similarity index 100% rename from mozilla/nsprpub/pr/tests/append.c rename to nspr/pr/tests/append.c diff --git a/mozilla/nsprpub/pr/tests/atomic.c b/nspr/pr/tests/atomic.c similarity index 100% rename from mozilla/nsprpub/pr/tests/atomic.c rename to nspr/pr/tests/atomic.c diff --git a/mozilla/nsprpub/pr/tests/attach.c b/nspr/pr/tests/attach.c similarity index 100% rename from mozilla/nsprpub/pr/tests/attach.c rename to nspr/pr/tests/attach.c diff --git a/mozilla/nsprpub/pr/tests/bigfile.c b/nspr/pr/tests/bigfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/bigfile.c rename to nspr/pr/tests/bigfile.c diff --git a/mozilla/nsprpub/pr/tests/bigfile2.c b/nspr/pr/tests/bigfile2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/bigfile2.c rename to nspr/pr/tests/bigfile2.c diff --git a/mozilla/nsprpub/pr/tests/bigfile3.c b/nspr/pr/tests/bigfile3.c similarity index 100% rename from mozilla/nsprpub/pr/tests/bigfile3.c rename to nspr/pr/tests/bigfile3.c diff --git a/mozilla/nsprpub/pr/tests/bug1test.c b/nspr/pr/tests/bug1test.c similarity index 100% rename from mozilla/nsprpub/pr/tests/bug1test.c rename to nspr/pr/tests/bug1test.c diff --git a/mozilla/nsprpub/pr/tests/cleanup.c b/nspr/pr/tests/cleanup.c similarity index 100% rename from mozilla/nsprpub/pr/tests/cleanup.c rename to nspr/pr/tests/cleanup.c diff --git a/mozilla/nsprpub/pr/tests/cltsrv.c b/nspr/pr/tests/cltsrv.c similarity index 100% rename from mozilla/nsprpub/pr/tests/cltsrv.c rename to nspr/pr/tests/cltsrv.c diff --git a/mozilla/nsprpub/pr/tests/concur.c b/nspr/pr/tests/concur.c similarity index 100% rename from mozilla/nsprpub/pr/tests/concur.c rename to nspr/pr/tests/concur.c diff --git a/mozilla/nsprpub/pr/tests/cvar.c b/nspr/pr/tests/cvar.c similarity index 100% rename from mozilla/nsprpub/pr/tests/cvar.c rename to nspr/pr/tests/cvar.c diff --git a/mozilla/nsprpub/pr/tests/cvar2.c b/nspr/pr/tests/cvar2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/cvar2.c rename to nspr/pr/tests/cvar2.c diff --git a/mozilla/nsprpub/pr/tests/dbmalloc.c b/nspr/pr/tests/dbmalloc.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dbmalloc.c rename to nspr/pr/tests/dbmalloc.c diff --git a/mozilla/nsprpub/pr/tests/dbmalloc1.c b/nspr/pr/tests/dbmalloc1.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dbmalloc1.c rename to nspr/pr/tests/dbmalloc1.c diff --git a/mozilla/nsprpub/pr/tests/dceemu.c b/nspr/pr/tests/dceemu.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dceemu.c rename to nspr/pr/tests/dceemu.c diff --git a/mozilla/nsprpub/pr/tests/depend.c b/nspr/pr/tests/depend.c similarity index 100% rename from mozilla/nsprpub/pr/tests/depend.c rename to nspr/pr/tests/depend.c diff --git a/mozilla/nsprpub/lib/libc/.cvsignore b/nspr/pr/tests/dll/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/libc/.cvsignore rename to nspr/pr/tests/dll/.cvsignore diff --git a/mozilla/nsprpub/pr/tests/dll/Makefile.in b/nspr/pr/tests/dll/Makefile.in similarity index 92% rename from mozilla/nsprpub/pr/tests/dll/Makefile.in rename to nspr/pr/tests/dll/Makefile.in index 9fb01e3..8b8c5ac 100644 --- a/mozilla/nsprpub/pr/tests/dll/Makefile.in +++ b/nspr/pr/tests/dll/Makefile.in @@ -14,13 +14,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - CSRCS = mygetval.c mysetval.c INCLUDES = -I$(dist_includedir) diff --git a/mozilla/nsprpub/pr/tests/dll/my.def b/nspr/pr/tests/dll/my.def similarity index 100% rename from mozilla/nsprpub/pr/tests/dll/my.def rename to nspr/pr/tests/dll/my.def diff --git a/mozilla/nsprpub/pr/tests/dll/mygetval.c b/nspr/pr/tests/dll/mygetval.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dll/mygetval.c rename to nspr/pr/tests/dll/mygetval.c diff --git a/mozilla/nsprpub/pr/tests/dll/mysetval.c b/nspr/pr/tests/dll/mysetval.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dll/mysetval.c rename to nspr/pr/tests/dll/mysetval.c diff --git a/mozilla/nsprpub/pr/tests/dlltest.c b/nspr/pr/tests/dlltest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dlltest.c rename to nspr/pr/tests/dlltest.c diff --git a/mozilla/nsprpub/pr/tests/dtoa.c b/nspr/pr/tests/dtoa.c similarity index 100% rename from mozilla/nsprpub/pr/tests/dtoa.c rename to nspr/pr/tests/dtoa.c diff --git a/mozilla/nsprpub/pr/tests/env.c b/nspr/pr/tests/env.c similarity index 100% rename from mozilla/nsprpub/pr/tests/env.c rename to nspr/pr/tests/env.c diff --git a/mozilla/nsprpub/pr/tests/errcodes.c b/nspr/pr/tests/errcodes.c similarity index 100% rename from mozilla/nsprpub/pr/tests/errcodes.c rename to nspr/pr/tests/errcodes.c diff --git a/mozilla/nsprpub/pr/tests/errset.c b/nspr/pr/tests/errset.c similarity index 100% rename from mozilla/nsprpub/pr/tests/errset.c rename to nspr/pr/tests/errset.c diff --git a/mozilla/nsprpub/pr/tests/exit.c b/nspr/pr/tests/exit.c similarity index 100% rename from mozilla/nsprpub/pr/tests/exit.c rename to nspr/pr/tests/exit.c diff --git a/mozilla/nsprpub/pr/tests/fdcach.c b/nspr/pr/tests/fdcach.c similarity index 100% rename from mozilla/nsprpub/pr/tests/fdcach.c rename to nspr/pr/tests/fdcach.c diff --git a/mozilla/nsprpub/pr/tests/fileio.c b/nspr/pr/tests/fileio.c similarity index 100% rename from mozilla/nsprpub/pr/tests/fileio.c rename to nspr/pr/tests/fileio.c diff --git a/mozilla/nsprpub/pr/tests/foreign.c b/nspr/pr/tests/foreign.c similarity index 100% rename from mozilla/nsprpub/pr/tests/foreign.c rename to nspr/pr/tests/foreign.c diff --git a/mozilla/nsprpub/pr/tests/forktest.c b/nspr/pr/tests/forktest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/forktest.c rename to nspr/pr/tests/forktest.c diff --git a/mozilla/nsprpub/pr/tests/formattm.c b/nspr/pr/tests/formattm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/formattm.c rename to nspr/pr/tests/formattm.c diff --git a/mozilla/nsprpub/pr/tests/freeif.c b/nspr/pr/tests/freeif.c similarity index 100% rename from mozilla/nsprpub/pr/tests/freeif.c rename to nspr/pr/tests/freeif.c diff --git a/mozilla/nsprpub/pr/tests/fsync.c b/nspr/pr/tests/fsync.c similarity index 100% rename from mozilla/nsprpub/pr/tests/fsync.c rename to nspr/pr/tests/fsync.c diff --git a/mozilla/nsprpub/pr/tests/getai.c b/nspr/pr/tests/getai.c similarity index 100% rename from mozilla/nsprpub/pr/tests/getai.c rename to nspr/pr/tests/getai.c diff --git a/mozilla/nsprpub/pr/tests/gethost.c b/nspr/pr/tests/gethost.c similarity index 100% rename from mozilla/nsprpub/pr/tests/gethost.c rename to nspr/pr/tests/gethost.c diff --git a/mozilla/nsprpub/pr/tests/getproto.c b/nspr/pr/tests/getproto.c similarity index 100% rename from mozilla/nsprpub/pr/tests/getproto.c rename to nspr/pr/tests/getproto.c diff --git a/mozilla/nsprpub/pr/tests/i2l.c b/nspr/pr/tests/i2l.c similarity index 100% rename from mozilla/nsprpub/pr/tests/i2l.c rename to nspr/pr/tests/i2l.c diff --git a/mozilla/nsprpub/pr/tests/initclk.c b/nspr/pr/tests/initclk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/initclk.c rename to nspr/pr/tests/initclk.c diff --git a/mozilla/nsprpub/pr/tests/inrval.c b/nspr/pr/tests/inrval.c similarity index 100% rename from mozilla/nsprpub/pr/tests/inrval.c rename to nspr/pr/tests/inrval.c diff --git a/mozilla/nsprpub/pr/tests/instrumt.c b/nspr/pr/tests/instrumt.c similarity index 100% rename from mozilla/nsprpub/pr/tests/instrumt.c rename to nspr/pr/tests/instrumt.c diff --git a/mozilla/nsprpub/pr/tests/intrio.c b/nspr/pr/tests/intrio.c similarity index 100% rename from mozilla/nsprpub/pr/tests/intrio.c rename to nspr/pr/tests/intrio.c diff --git a/mozilla/nsprpub/pr/tests/intrupt.c b/nspr/pr/tests/intrupt.c similarity index 100% rename from mozilla/nsprpub/pr/tests/intrupt.c rename to nspr/pr/tests/intrupt.c diff --git a/mozilla/nsprpub/pr/tests/io_timeout.c b/nspr/pr/tests/io_timeout.c similarity index 100% rename from mozilla/nsprpub/pr/tests/io_timeout.c rename to nspr/pr/tests/io_timeout.c diff --git a/mozilla/nsprpub/pr/tests/io_timeoutk.c b/nspr/pr/tests/io_timeoutk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/io_timeoutk.c rename to nspr/pr/tests/io_timeoutk.c diff --git a/mozilla/nsprpub/pr/tests/io_timeoutu.c b/nspr/pr/tests/io_timeoutu.c similarity index 100% rename from mozilla/nsprpub/pr/tests/io_timeoutu.c rename to nspr/pr/tests/io_timeoutu.c diff --git a/mozilla/nsprpub/pr/tests/ioconthr.c b/nspr/pr/tests/ioconthr.c similarity index 100% rename from mozilla/nsprpub/pr/tests/ioconthr.c rename to nspr/pr/tests/ioconthr.c diff --git a/mozilla/nsprpub/pr/tests/ipv6.c b/nspr/pr/tests/ipv6.c similarity index 100% rename from mozilla/nsprpub/pr/tests/ipv6.c rename to nspr/pr/tests/ipv6.c diff --git a/mozilla/nsprpub/pr/tests/join.c b/nspr/pr/tests/join.c similarity index 100% rename from mozilla/nsprpub/pr/tests/join.c rename to nspr/pr/tests/join.c diff --git a/mozilla/nsprpub/pr/tests/joinkk.c b/nspr/pr/tests/joinkk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/joinkk.c rename to nspr/pr/tests/joinkk.c diff --git a/mozilla/nsprpub/pr/tests/joinku.c b/nspr/pr/tests/joinku.c similarity index 100% rename from mozilla/nsprpub/pr/tests/joinku.c rename to nspr/pr/tests/joinku.c diff --git a/mozilla/nsprpub/pr/tests/joinuk.c b/nspr/pr/tests/joinuk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/joinuk.c rename to nspr/pr/tests/joinuk.c diff --git a/mozilla/nsprpub/pr/tests/joinuu.c b/nspr/pr/tests/joinuu.c similarity index 100% rename from mozilla/nsprpub/pr/tests/joinuu.c rename to nspr/pr/tests/joinuu.c diff --git a/mozilla/nsprpub/pr/tests/layer.c b/nspr/pr/tests/layer.c similarity index 100% rename from mozilla/nsprpub/pr/tests/layer.c rename to nspr/pr/tests/layer.c diff --git a/mozilla/nsprpub/pr/tests/lazyinit.c b/nspr/pr/tests/lazyinit.c similarity index 100% rename from mozilla/nsprpub/pr/tests/lazyinit.c rename to nspr/pr/tests/lazyinit.c diff --git a/mozilla/nsprpub/pr/tests/libfilename.c b/nspr/pr/tests/libfilename.c similarity index 100% rename from mozilla/nsprpub/pr/tests/libfilename.c rename to nspr/pr/tests/libfilename.c diff --git a/mozilla/nsprpub/pr/tests/lltest.c b/nspr/pr/tests/lltest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/lltest.c rename to nspr/pr/tests/lltest.c diff --git a/mozilla/nsprpub/pr/tests/lock.c b/nspr/pr/tests/lock.c similarity index 100% rename from mozilla/nsprpub/pr/tests/lock.c rename to nspr/pr/tests/lock.c diff --git a/mozilla/nsprpub/pr/tests/lockfile.c b/nspr/pr/tests/lockfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/lockfile.c rename to nspr/pr/tests/lockfile.c diff --git a/mozilla/nsprpub/pr/tests/logfile.c b/nspr/pr/tests/logfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/logfile.c rename to nspr/pr/tests/logfile.c diff --git a/mozilla/nsprpub/pr/tests/logger.c b/nspr/pr/tests/logger.c similarity index 100% rename from mozilla/nsprpub/pr/tests/logger.c rename to nspr/pr/tests/logger.c diff --git a/mozilla/nsprpub/pr/tests/makedir.c b/nspr/pr/tests/makedir.c similarity index 100% rename from mozilla/nsprpub/pr/tests/makedir.c rename to nspr/pr/tests/makedir.c diff --git a/mozilla/nsprpub/pr/tests/many_cv.c b/nspr/pr/tests/many_cv.c similarity index 100% rename from mozilla/nsprpub/pr/tests/many_cv.c rename to nspr/pr/tests/many_cv.c diff --git a/mozilla/nsprpub/pr/tests/mbcs.c b/nspr/pr/tests/mbcs.c similarity index 100% rename from mozilla/nsprpub/pr/tests/mbcs.c rename to nspr/pr/tests/mbcs.c diff --git a/mozilla/nsprpub/pr/tests/multiacc.c b/nspr/pr/tests/multiacc.c similarity index 100% rename from mozilla/nsprpub/pr/tests/multiacc.c rename to nspr/pr/tests/multiacc.c diff --git a/mozilla/nsprpub/pr/tests/multiwait.c b/nspr/pr/tests/multiwait.c similarity index 100% rename from mozilla/nsprpub/pr/tests/multiwait.c rename to nspr/pr/tests/multiwait.c diff --git a/mozilla/nsprpub/pr/tests/nameshm1.c b/nspr/pr/tests/nameshm1.c similarity index 100% rename from mozilla/nsprpub/pr/tests/nameshm1.c rename to nspr/pr/tests/nameshm1.c diff --git a/mozilla/nsprpub/pr/tests/nbconn.c b/nspr/pr/tests/nbconn.c similarity index 100% rename from mozilla/nsprpub/pr/tests/nbconn.c rename to nspr/pr/tests/nbconn.c diff --git a/mozilla/nsprpub/pr/tests/nblayer.c b/nspr/pr/tests/nblayer.c similarity index 100% rename from mozilla/nsprpub/pr/tests/nblayer.c rename to nspr/pr/tests/nblayer.c diff --git a/mozilla/nsprpub/pr/tests/nonblock.c b/nspr/pr/tests/nonblock.c similarity index 100% rename from mozilla/nsprpub/pr/tests/nonblock.c rename to nspr/pr/tests/nonblock.c diff --git a/mozilla/nsprpub/pr/tests/ntioto.c b/nspr/pr/tests/ntioto.c similarity index 100% rename from mozilla/nsprpub/pr/tests/ntioto.c rename to nspr/pr/tests/ntioto.c diff --git a/mozilla/nsprpub/pr/tests/ntoh.c b/nspr/pr/tests/ntoh.c similarity index 100% rename from mozilla/nsprpub/pr/tests/ntoh.c rename to nspr/pr/tests/ntoh.c diff --git a/mozilla/nsprpub/pr/tests/obsints.c b/nspr/pr/tests/obsints.c similarity index 100% rename from mozilla/nsprpub/pr/tests/obsints.c rename to nspr/pr/tests/obsints.c diff --git a/mozilla/nsprpub/pr/tests/op_2long.c b/nspr/pr/tests/op_2long.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_2long.c rename to nspr/pr/tests/op_2long.c diff --git a/mozilla/nsprpub/pr/tests/op_excl.c b/nspr/pr/tests/op_excl.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_excl.c rename to nspr/pr/tests/op_excl.c diff --git a/mozilla/nsprpub/pr/tests/op_filnf.c b/nspr/pr/tests/op_filnf.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_filnf.c rename to nspr/pr/tests/op_filnf.c diff --git a/mozilla/nsprpub/pr/tests/op_filok.c b/nspr/pr/tests/op_filok.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_filok.c rename to nspr/pr/tests/op_filok.c diff --git a/mozilla/nsprpub/pr/tests/op_noacc.c b/nspr/pr/tests/op_noacc.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_noacc.c rename to nspr/pr/tests/op_noacc.c diff --git a/mozilla/nsprpub/pr/tests/op_nofil.c b/nspr/pr/tests/op_nofil.c similarity index 100% rename from mozilla/nsprpub/pr/tests/op_nofil.c rename to nspr/pr/tests/op_nofil.c diff --git a/mozilla/nsprpub/pr/tests/openfile.c b/nspr/pr/tests/openfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/openfile.c rename to nspr/pr/tests/openfile.c diff --git a/mozilla/nsprpub/pr/tests/parent.c b/nspr/pr/tests/parent.c similarity index 100% rename from mozilla/nsprpub/pr/tests/parent.c rename to nspr/pr/tests/parent.c diff --git a/mozilla/nsprpub/pr/tests/parsetm.c b/nspr/pr/tests/parsetm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/parsetm.c rename to nspr/pr/tests/parsetm.c diff --git a/mozilla/nsprpub/pr/tests/peek.c b/nspr/pr/tests/peek.c similarity index 100% rename from mozilla/nsprpub/pr/tests/peek.c rename to nspr/pr/tests/peek.c diff --git a/mozilla/nsprpub/pr/tests/perf.c b/nspr/pr/tests/perf.c similarity index 100% rename from mozilla/nsprpub/pr/tests/perf.c rename to nspr/pr/tests/perf.c diff --git a/mozilla/nsprpub/pr/tests/pipeping.c b/nspr/pr/tests/pipeping.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pipeping.c rename to nspr/pr/tests/pipeping.c diff --git a/mozilla/nsprpub/pr/tests/pipeping2.c b/nspr/pr/tests/pipeping2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pipeping2.c rename to nspr/pr/tests/pipeping2.c diff --git a/mozilla/nsprpub/pr/tests/pipepong.c b/nspr/pr/tests/pipepong.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pipepong.c rename to nspr/pr/tests/pipepong.c diff --git a/mozilla/nsprpub/pr/tests/pipepong2.c b/nspr/pr/tests/pipepong2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pipepong2.c rename to nspr/pr/tests/pipepong2.c diff --git a/mozilla/nsprpub/pr/tests/pipeself.c b/nspr/pr/tests/pipeself.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pipeself.c rename to nspr/pr/tests/pipeself.c diff --git a/mozilla/nsprpub/pr/tests/poll_er.c b/nspr/pr/tests/poll_er.c similarity index 100% rename from mozilla/nsprpub/pr/tests/poll_er.c rename to nspr/pr/tests/poll_er.c diff --git a/mozilla/nsprpub/pr/tests/poll_nm.c b/nspr/pr/tests/poll_nm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/poll_nm.c rename to nspr/pr/tests/poll_nm.c diff --git a/mozilla/nsprpub/pr/tests/poll_to.c b/nspr/pr/tests/poll_to.c similarity index 100% rename from mozilla/nsprpub/pr/tests/poll_to.c rename to nspr/pr/tests/poll_to.c diff --git a/mozilla/nsprpub/pr/tests/pollable.c b/nspr/pr/tests/pollable.c similarity index 100% rename from mozilla/nsprpub/pr/tests/pollable.c rename to nspr/pr/tests/pollable.c diff --git a/mozilla/nsprpub/pr/tests/prftest.c b/nspr/pr/tests/prftest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prftest.c rename to nspr/pr/tests/prftest.c diff --git a/mozilla/nsprpub/pr/tests/prftest1.c b/nspr/pr/tests/prftest1.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prftest1.c rename to nspr/pr/tests/prftest1.c diff --git a/mozilla/nsprpub/pr/tests/prftest2.c b/nspr/pr/tests/prftest2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prftest2.c rename to nspr/pr/tests/prftest2.c diff --git a/mozilla/nsprpub/pr/tests/primblok.c b/nspr/pr/tests/primblok.c similarity index 100% rename from mozilla/nsprpub/pr/tests/primblok.c rename to nspr/pr/tests/primblok.c diff --git a/mozilla/nsprpub/pr/tests/priotest.c b/nspr/pr/tests/priotest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/priotest.c rename to nspr/pr/tests/priotest.c diff --git a/mozilla/nsprpub/pr/tests/provider.c b/nspr/pr/tests/provider.c similarity index 100% rename from mozilla/nsprpub/pr/tests/provider.c rename to nspr/pr/tests/provider.c diff --git a/mozilla/nsprpub/pr/tests/prpoll.c b/nspr/pr/tests/prpoll.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prpoll.c rename to nspr/pr/tests/prpoll.c diff --git a/mozilla/nsprpub/pr/tests/prpollml.c b/nspr/pr/tests/prpollml.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prpollml.c rename to nspr/pr/tests/prpollml.c diff --git a/mozilla/nsprpub/pr/tests/prselect.c b/nspr/pr/tests/prselect.c similarity index 100% rename from mozilla/nsprpub/pr/tests/prselect.c rename to nspr/pr/tests/prselect.c diff --git a/mozilla/nsprpub/pr/tests/prttools.h b/nspr/pr/tests/prttools.h similarity index 100% rename from mozilla/nsprpub/pr/tests/prttools.h rename to nspr/pr/tests/prttools.h diff --git a/nspr/pr/tests/pushtop.c b/nspr/pr/tests/pushtop.c new file mode 100644 index 0000000..621a7c7 --- /dev/null +++ b/nspr/pr/tests/pushtop.c @@ -0,0 +1,73 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* A regression test for bug 794316 */ + +#include +#include + +#include "prio.h" + +static PRIOMethods dummyMethods; + +int main() +{ + PRDescIdentity topId, middleId, bottomId; + PRFileDesc *top, *middle, *bottom; + PRFileDesc *fd; + + topId = PR_GetUniqueIdentity("top"); + middleId = PR_GetUniqueIdentity("middle"); + bottomId = PR_GetUniqueIdentity("bottom"); + + top = PR_CreateIOLayerStub(topId, &dummyMethods); + middle = PR_CreateIOLayerStub(middleId, &dummyMethods); + bottom = PR_CreateIOLayerStub(bottomId, &dummyMethods); + + fd = bottom; + PR_PushIOLayer(fd, PR_TOP_IO_LAYER, middle); + PR_PushIOLayer(fd, PR_TOP_IO_LAYER, top); + + top = fd; + middle = top->lower; + bottom = middle->lower; + + /* Verify that the higher pointers are correct. */ + if (middle->higher != top) { + fprintf(stderr, "middle->higher is wrong\n"); + fprintf(stderr, "FAILED\n"); + exit(1); + } + if (bottom->higher != middle) { + fprintf(stderr, "bottom->higher is wrong\n"); + fprintf(stderr, "FAILED\n"); + exit(1); + } + + top = PR_PopIOLayer(fd, topId); + top->dtor(top); + + middle = fd; + bottom = middle->lower; + + /* Verify that the higher pointer is correct. */ + if (bottom->higher != middle) { + fprintf(stderr, "bottom->higher is wrong\n"); + fprintf(stderr, "FAILED\n"); + exit(1); + } + + middle = PR_PopIOLayer(fd, middleId); + middle->dtor(middle); + if (fd->identity != bottomId) { + fprintf(stderr, "The bottom layer has the wrong identity\n"); + fprintf(stderr, "FAILED\n"); + exit(1); + } + fd->dtor(fd); + + printf("PASS\n"); + return 0; +} diff --git a/mozilla/nsprpub/pr/tests/randseed.c b/nspr/pr/tests/randseed.c similarity index 100% rename from mozilla/nsprpub/pr/tests/randseed.c rename to nspr/pr/tests/randseed.c diff --git a/mozilla/nsprpub/pr/tests/ranfile.c b/nspr/pr/tests/ranfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/ranfile.c rename to nspr/pr/tests/ranfile.c diff --git a/mozilla/nsprpub/pr/tests/reinit.c b/nspr/pr/tests/reinit.c similarity index 100% rename from mozilla/nsprpub/pr/tests/reinit.c rename to nspr/pr/tests/reinit.c diff --git a/mozilla/nsprpub/pr/tests/rmdir.c b/nspr/pr/tests/rmdir.c similarity index 100% rename from mozilla/nsprpub/pr/tests/rmdir.c rename to nspr/pr/tests/rmdir.c diff --git a/mozilla/nsprpub/pr/tests/runtests.pl b/nspr/pr/tests/runtests.pl similarity index 99% rename from mozilla/nsprpub/pr/tests/runtests.pl rename to nspr/pr/tests/runtests.pl index 7191d91..3a164b1 100755 --- a/mozilla/nsprpub/pr/tests/runtests.pl +++ b/nspr/pr/tests/runtests.pl @@ -313,6 +313,7 @@ $prog = shift; # Program to test "primblok", "provider", "prpollml", +"pushtop", "ranfile", "randseed", "reinit", diff --git a/mozilla/nsprpub/pr/tests/runtests.sh b/nspr/pr/tests/runtests.sh similarity index 99% rename from mozilla/nsprpub/pr/tests/runtests.sh rename to nspr/pr/tests/runtests.sh index 43df19f..535b93a 100755 --- a/mozilla/nsprpub/pr/tests/runtests.sh +++ b/nspr/pr/tests/runtests.sh @@ -143,6 +143,7 @@ prftest primblok provider prpollml +pushtop ranfile randseed reinit diff --git a/mozilla/nsprpub/pr/tests/runy2ktests.ksh b/nspr/pr/tests/runy2ktests.ksh similarity index 100% rename from mozilla/nsprpub/pr/tests/runy2ktests.ksh rename to nspr/pr/tests/runy2ktests.ksh diff --git a/mozilla/nsprpub/pr/tests/rwlocktest.c b/nspr/pr/tests/rwlocktest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/rwlocktest.c rename to nspr/pr/tests/rwlocktest.c diff --git a/mozilla/nsprpub/pr/tests/sel_spd.c b/nspr/pr/tests/sel_spd.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sel_spd.c rename to nspr/pr/tests/sel_spd.c diff --git a/mozilla/nsprpub/pr/tests/selct_er.c b/nspr/pr/tests/selct_er.c similarity index 100% rename from mozilla/nsprpub/pr/tests/selct_er.c rename to nspr/pr/tests/selct_er.c diff --git a/mozilla/nsprpub/pr/tests/selct_nm.c b/nspr/pr/tests/selct_nm.c similarity index 100% rename from mozilla/nsprpub/pr/tests/selct_nm.c rename to nspr/pr/tests/selct_nm.c diff --git a/mozilla/nsprpub/pr/tests/selct_to.c b/nspr/pr/tests/selct_to.c similarity index 100% rename from mozilla/nsprpub/pr/tests/selct_to.c rename to nspr/pr/tests/selct_to.c diff --git a/mozilla/nsprpub/pr/tests/select2.c b/nspr/pr/tests/select2.c similarity index 100% rename from mozilla/nsprpub/pr/tests/select2.c rename to nspr/pr/tests/select2.c diff --git a/mozilla/nsprpub/pr/tests/selintr.c b/nspr/pr/tests/selintr.c similarity index 100% rename from mozilla/nsprpub/pr/tests/selintr.c rename to nspr/pr/tests/selintr.c diff --git a/mozilla/nsprpub/pr/tests/sem.c b/nspr/pr/tests/sem.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sem.c rename to nspr/pr/tests/sem.c diff --git a/mozilla/nsprpub/pr/tests/sema.c b/nspr/pr/tests/sema.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sema.c rename to nspr/pr/tests/sema.c diff --git a/mozilla/nsprpub/pr/tests/semaerr.c b/nspr/pr/tests/semaerr.c similarity index 100% rename from mozilla/nsprpub/pr/tests/semaerr.c rename to nspr/pr/tests/semaerr.c diff --git a/mozilla/nsprpub/pr/tests/semaerr1.c b/nspr/pr/tests/semaerr1.c similarity index 100% rename from mozilla/nsprpub/pr/tests/semaerr1.c rename to nspr/pr/tests/semaerr1.c diff --git a/mozilla/nsprpub/pr/tests/semaping.c b/nspr/pr/tests/semaping.c similarity index 100% rename from mozilla/nsprpub/pr/tests/semaping.c rename to nspr/pr/tests/semaping.c diff --git a/mozilla/nsprpub/pr/tests/semapong.c b/nspr/pr/tests/semapong.c similarity index 100% rename from mozilla/nsprpub/pr/tests/semapong.c rename to nspr/pr/tests/semapong.c diff --git a/mozilla/nsprpub/pr/tests/sendzlf.c b/nspr/pr/tests/sendzlf.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sendzlf.c rename to nspr/pr/tests/sendzlf.c diff --git a/mozilla/nsprpub/pr/tests/server_test.c b/nspr/pr/tests/server_test.c similarity index 100% rename from mozilla/nsprpub/pr/tests/server_test.c rename to nspr/pr/tests/server_test.c diff --git a/mozilla/nsprpub/pr/tests/servr_kk.c b/nspr/pr/tests/servr_kk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/servr_kk.c rename to nspr/pr/tests/servr_kk.c diff --git a/mozilla/nsprpub/pr/tests/servr_ku.c b/nspr/pr/tests/servr_ku.c similarity index 100% rename from mozilla/nsprpub/pr/tests/servr_ku.c rename to nspr/pr/tests/servr_ku.c diff --git a/mozilla/nsprpub/pr/tests/servr_uk.c b/nspr/pr/tests/servr_uk.c similarity index 100% rename from mozilla/nsprpub/pr/tests/servr_uk.c rename to nspr/pr/tests/servr_uk.c diff --git a/mozilla/nsprpub/pr/tests/servr_uu.c b/nspr/pr/tests/servr_uu.c similarity index 100% rename from mozilla/nsprpub/pr/tests/servr_uu.c rename to nspr/pr/tests/servr_uu.c diff --git a/mozilla/nsprpub/pr/tests/short_thread.c b/nspr/pr/tests/short_thread.c similarity index 100% rename from mozilla/nsprpub/pr/tests/short_thread.c rename to nspr/pr/tests/short_thread.c diff --git a/mozilla/nsprpub/pr/tests/sigpipe.c b/nspr/pr/tests/sigpipe.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sigpipe.c rename to nspr/pr/tests/sigpipe.c diff --git a/mozilla/nsprpub/pr/tests/sleep.c b/nspr/pr/tests/sleep.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sleep.c rename to nspr/pr/tests/sleep.c diff --git a/mozilla/nsprpub/pr/tests/socket.c b/nspr/pr/tests/socket.c similarity index 100% rename from mozilla/nsprpub/pr/tests/socket.c rename to nspr/pr/tests/socket.c diff --git a/mozilla/nsprpub/pr/tests/sockopt.c b/nspr/pr/tests/sockopt.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sockopt.c rename to nspr/pr/tests/sockopt.c diff --git a/mozilla/nsprpub/pr/tests/sockping.c b/nspr/pr/tests/sockping.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sockping.c rename to nspr/pr/tests/sockping.c diff --git a/mozilla/nsprpub/pr/tests/sockpong.c b/nspr/pr/tests/sockpong.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sockpong.c rename to nspr/pr/tests/sockpong.c diff --git a/mozilla/nsprpub/pr/tests/sprintf.c b/nspr/pr/tests/sprintf.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sprintf.c rename to nspr/pr/tests/sprintf.c diff --git a/mozilla/nsprpub/pr/tests/sproc_ch.c b/nspr/pr/tests/sproc_ch.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sproc_ch.c rename to nspr/pr/tests/sproc_ch.c diff --git a/mozilla/nsprpub/pr/tests/sproc_p.c b/nspr/pr/tests/sproc_p.c similarity index 100% rename from mozilla/nsprpub/pr/tests/sproc_p.c rename to nspr/pr/tests/sproc_p.c diff --git a/mozilla/nsprpub/pr/tests/stack.c b/nspr/pr/tests/stack.c similarity index 100% rename from mozilla/nsprpub/pr/tests/stack.c rename to nspr/pr/tests/stack.c diff --git a/mozilla/nsprpub/pr/tests/stat.c b/nspr/pr/tests/stat.c similarity index 100% rename from mozilla/nsprpub/pr/tests/stat.c rename to nspr/pr/tests/stat.c diff --git a/mozilla/nsprpub/pr/tests/stdio.c b/nspr/pr/tests/stdio.c similarity index 100% rename from mozilla/nsprpub/pr/tests/stdio.c rename to nspr/pr/tests/stdio.c diff --git a/mozilla/nsprpub/pr/tests/str2addr.c b/nspr/pr/tests/str2addr.c similarity index 100% rename from mozilla/nsprpub/pr/tests/str2addr.c rename to nspr/pr/tests/str2addr.c diff --git a/mozilla/nsprpub/pr/tests/strod.c b/nspr/pr/tests/strod.c similarity index 100% rename from mozilla/nsprpub/pr/tests/strod.c rename to nspr/pr/tests/strod.c diff --git a/mozilla/nsprpub/pr/tests/suspend.c b/nspr/pr/tests/suspend.c similarity index 100% rename from mozilla/nsprpub/pr/tests/suspend.c rename to nspr/pr/tests/suspend.c diff --git a/mozilla/nsprpub/pr/tests/switch.c b/nspr/pr/tests/switch.c similarity index 100% rename from mozilla/nsprpub/pr/tests/switch.c rename to nspr/pr/tests/switch.c diff --git a/mozilla/nsprpub/pr/tests/system.c b/nspr/pr/tests/system.c similarity index 100% rename from mozilla/nsprpub/pr/tests/system.c rename to nspr/pr/tests/system.c diff --git a/mozilla/nsprpub/pr/tests/testbit.c b/nspr/pr/tests/testbit.c similarity index 100% rename from mozilla/nsprpub/pr/tests/testbit.c rename to nspr/pr/tests/testbit.c diff --git a/mozilla/nsprpub/pr/tests/testfile.c b/nspr/pr/tests/testfile.c similarity index 100% rename from mozilla/nsprpub/pr/tests/testfile.c rename to nspr/pr/tests/testfile.c diff --git a/mozilla/nsprpub/pr/tests/threads.c b/nspr/pr/tests/threads.c similarity index 100% rename from mozilla/nsprpub/pr/tests/threads.c rename to nspr/pr/tests/threads.c diff --git a/mozilla/nsprpub/pr/tests/thrpool_client.c b/nspr/pr/tests/thrpool_client.c similarity index 100% rename from mozilla/nsprpub/pr/tests/thrpool_client.c rename to nspr/pr/tests/thrpool_client.c diff --git a/mozilla/nsprpub/pr/tests/thrpool_server.c b/nspr/pr/tests/thrpool_server.c similarity index 100% rename from mozilla/nsprpub/pr/tests/thrpool_server.c rename to nspr/pr/tests/thrpool_server.c diff --git a/mozilla/nsprpub/pr/tests/thruput.c b/nspr/pr/tests/thruput.c similarity index 100% rename from mozilla/nsprpub/pr/tests/thruput.c rename to nspr/pr/tests/thruput.c diff --git a/mozilla/nsprpub/pr/tests/time.c b/nspr/pr/tests/time.c similarity index 100% rename from mozilla/nsprpub/pr/tests/time.c rename to nspr/pr/tests/time.c diff --git a/mozilla/nsprpub/pr/tests/timemac.c b/nspr/pr/tests/timemac.c similarity index 100% rename from mozilla/nsprpub/pr/tests/timemac.c rename to nspr/pr/tests/timemac.c diff --git a/mozilla/nsprpub/pr/tests/timetest.c b/nspr/pr/tests/timetest.c similarity index 100% rename from mozilla/nsprpub/pr/tests/timetest.c rename to nspr/pr/tests/timetest.c diff --git a/mozilla/nsprpub/pr/tests/tmoacc.c b/nspr/pr/tests/tmoacc.c similarity index 100% rename from mozilla/nsprpub/pr/tests/tmoacc.c rename to nspr/pr/tests/tmoacc.c diff --git a/mozilla/nsprpub/pr/tests/tmocon.c b/nspr/pr/tests/tmocon.c similarity index 100% rename from mozilla/nsprpub/pr/tests/tmocon.c rename to nspr/pr/tests/tmocon.c diff --git a/mozilla/nsprpub/pr/tests/tpd.c b/nspr/pr/tests/tpd.c similarity index 100% rename from mozilla/nsprpub/pr/tests/tpd.c rename to nspr/pr/tests/tpd.c diff --git a/mozilla/nsprpub/pr/tests/udpsrv.c b/nspr/pr/tests/udpsrv.c similarity index 100% rename from mozilla/nsprpub/pr/tests/udpsrv.c rename to nspr/pr/tests/udpsrv.c diff --git a/mozilla/nsprpub/pr/tests/ut_ttools.h b/nspr/pr/tests/ut_ttools.h similarity index 100% rename from mozilla/nsprpub/pr/tests/ut_ttools.h rename to nspr/pr/tests/ut_ttools.h diff --git a/mozilla/nsprpub/pr/tests/vercheck.c b/nspr/pr/tests/vercheck.c similarity index 90% rename from mozilla/nsprpub/pr/tests/vercheck.c rename to nspr/pr/tests/vercheck.c index 2f42523..8b98d87 100644 --- a/mozilla/nsprpub/pr/tests/vercheck.c +++ b/nspr/pr/tests/vercheck.c @@ -20,10 +20,10 @@ #include /* - * This release (4.9.2) is backward compatible with the + * This release (4.10) is backward compatible with the * 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x, - * 4.8.x, 4.9, and 4.9.1 releases. It, of course, - * is compatible with itself. + * 4.8.x, and 4.9.x releases. + * It, of course, is compatible with itself. */ static char *compatible_version[] = { "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", @@ -35,7 +35,9 @@ static char *compatible_version[] = { "4.7.6", "4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5", "4.8.6", "4.8.7", "4.8.8", "4.8.9", - "4.9", "4.9.1", PR_VERSION + "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", "4.9.5", + "4.9.6", + PR_VERSION }; /* @@ -50,8 +52,8 @@ static char *incompatible_version[] = { "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.9.3", - "4.10", "4.10.1", + "4.10.1", + "4.11", "4.11.1", "10.0", "11.1", "12.14.20" }; diff --git a/mozilla/nsprpub/pr/tests/version.c b/nspr/pr/tests/version.c similarity index 100% rename from mozilla/nsprpub/pr/tests/version.c rename to nspr/pr/tests/version.c diff --git a/mozilla/nsprpub/pr/tests/writev.c b/nspr/pr/tests/writev.c similarity index 100% rename from mozilla/nsprpub/pr/tests/writev.c rename to nspr/pr/tests/writev.c diff --git a/mozilla/nsprpub/pr/tests/xnotify.c b/nspr/pr/tests/xnotify.c similarity index 100% rename from mozilla/nsprpub/pr/tests/xnotify.c rename to nspr/pr/tests/xnotify.c diff --git a/mozilla/nsprpub/pr/tests/y2k.c b/nspr/pr/tests/y2k.c similarity index 100% rename from mozilla/nsprpub/pr/tests/y2k.c rename to nspr/pr/tests/y2k.c diff --git a/mozilla/nsprpub/pr/tests/y2ktmo.c b/nspr/pr/tests/y2ktmo.c similarity index 100% rename from mozilla/nsprpub/pr/tests/y2ktmo.c rename to nspr/pr/tests/y2ktmo.c diff --git a/mozilla/nsprpub/pr/tests/yield.c b/nspr/pr/tests/yield.c similarity index 100% rename from mozilla/nsprpub/pr/tests/yield.c rename to nspr/pr/tests/yield.c diff --git a/mozilla/nsprpub/pr/tests/zerolen.c b/nspr/pr/tests/zerolen.c similarity index 100% rename from mozilla/nsprpub/pr/tests/zerolen.c rename to nspr/pr/tests/zerolen.c diff --git a/mozilla/nsprpub/lib/.cvsignore b/nspr/tools/.cvsignore similarity index 100% rename from mozilla/nsprpub/lib/.cvsignore rename to nspr/tools/.cvsignore diff --git a/mozilla/nsprpub/tools/Makefile.in b/nspr/tools/Makefile.in similarity index 84% rename from mozilla/nsprpub/tools/Makefile.in rename to nspr/tools/Makefile.in index 817f1fa..b54776c 100644 --- a/mozilla/nsprpub/tools/Makefile.in +++ b/nspr/tools/Makefile.in @@ -86,13 +86,11 @@ endif # Solaris ifeq ($(OS_ARCH), SunOS) -ifneq ($(OS_RELEASE), 4.1.3_U1) ifdef NS_USE_GCC LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir) else LDOPTS += -R $(PWD)/$(dist_libdir) endif -endif # SunOS 5.5 needs to link with -lpthread, even though we already # linked with this system library when we built libnspr.so. @@ -103,24 +101,6 @@ endif endif endif # SunOS -ifeq ($(OS_ARCH), NCR) -# XXX: We see some strange problems when we link with libnspr.so. -# So for now we use static libraries on NCR. The shared library -# stuff below is commented out. -LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).a -LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).a -EXTRA_LIBS = -lsocket -lnsl -ldl - -# NCR needs to link against -lsocket -lnsl (and -lc, which is linked -# implicitly by $(CC)) again even though we already linked with these -# system libraries when we built libnspr.so. -#EXTRA_LIBS = -lsocket -lnsl -# This hardcodes in the executable programs the directory to find -# libnspr.so etc. at program startup. Equivalent to the -R or -rpath -# option for ld on other platforms. -#export LD_RUN_PATH = $(PWD)/$(dist_libdir) -endif - ifeq ($(OS_ARCH), SCOOS) # SCO Unix needs to link against -lsocket again even though we # already linked with these system libraries when we built libnspr.so. diff --git a/mozilla/nsprpub/tools/httpget.c b/nspr/tools/httpget.c similarity index 100% rename from mozilla/nsprpub/tools/httpget.c rename to nspr/tools/httpget.c diff --git a/mozilla/nsprpub/tools/tail.c b/nspr/tools/tail.c similarity index 100% rename from mozilla/nsprpub/tools/tail.c rename to nspr/tools/tail.c -- 2.7.4