nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

update nspr to NSPR_HEAD_20100311 r=wtc

Browse source
This commit is contained in:
Brad Lassey 2010-03-11 12:14:58 -05:00
parent 6a649a6eff
commit 6517d87cf5
12 changed files with 75 additions and 75 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
nsprpub/admin/repackage.sh
View file

@ -64,10 +64,10 @@
#
# ------------------------------------------------------------------
FROMTOP=/share/builds/components/nspr20/v4.8.4
TOTOP=./v4.8.4
NSPRDIR=nspr-4.8.4
SOURCETAG=NSPR_4_8_4_RTM
FROMTOP=/share/builds/components/nspr20/v4.8.5
TOTOP=./v4.8.5
NSPRDIR=nspr-4.8.5
SOURCETAG=NSPR_4_8_5_RTM
#
# enumerate Unix object directories on /s/b/c

25
nsprpub/configure vendored
View file

@ -695,7 +695,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=8
MOD_PATCH_VERSION=4
MOD_PATCH_VERSION=5
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@ -3575,6 +3575,7 @@ EOF
DSO_CFLAGS=+Z
else
DSO_CFLAGS=-fPIC
ASFLAGS="$ASFLAGS -x assembler-with-cpp"
fi
if test -n "$MOZILLA_CLIENT"; then
@ -4180,8 +4181,7 @@ EOF
EOF
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=
AR_FLAGS='-NOLOGO -OUT:"$@"'
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
@ -4196,7 +4196,7 @@ EOF
LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
DLLFLAGS='-OUT:"$@"'
if test -n "$MOZ_DEBUG_SYMBOLS"; then
if test -n "$MOZ_DEBUG_SYMBOLS" || test -n "$MOZ_DEBUG"; then
OS_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
OS_DLLFLAGS='-DEBUG -DEBUGTYPE:CV'
DSO_LDOPTS='-DEBUG -DEBUGTYPE:CV'
@ -5367,10 +5367,13 @@ case "$target_os" in
darwin*)
_HAVE_PTHREADS=1
;;
wince*)
_HAVE_PTHREADS=
;;
*)
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
echo "configure:5374: checking for pthread_create in -lpthreads" >&5
echo "configure:5377: checking for pthread_create in -lpthreads" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
@ -5392,7 +5395,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:5396: checking for pthread_create in -lpthread" >&5
echo "configure:5399: checking for pthread_create in -lpthread" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
@ -5414,7 +5417,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
echo "configure:5418: checking for pthread_create in -lc_r" >&5
echo "configure:5421: checking for pthread_create in -lc_r" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
@ -5436,7 +5439,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
echo "configure:5440: checking for pthread_create in -lc" >&5
echo "configure:5443: checking for pthread_create in -lc" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
@ -5568,7 +5571,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:5572: checking whether ${CC-cc} accepts -pthread" >&5
echo "configure:5575: 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
@ -5591,7 +5594,7 @@ echo "configure:5572: 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:5595: checking whether ${CC-cc} accepts -pthreads" >&5
echo "configure:5598: 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
@ -5879,7 +5882,7 @@ if test -n "$MOZ_OPTIMIZE"; then
CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS"
fi
if test -n "$MOZ_DEBUG"; then
if test -n "$MOZ_DEBUG_SYMBOLS" || test -n "$MOZ_DEBUG"; then
CFLAGS="$CFLAGS $_DEBUG_FLAGS"
CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS"
fi

13
nsprpub/configure.in
View file

@ -50,7 +50,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=8
MOD_PATCH_VERSION=4
MOD_PATCH_VERSION=5
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
@ -1200,6 +1200,7 @@ tools are selected during the Xcode/Developer Tools installation.])
DSO_CFLAGS=+Z
else
DSO_CFLAGS=-fPIC
ASFLAGS="$ASFLAGS -x assembler-with-cpp"
fi
if test -n "$MOZILLA_CLIENT"; then
@ -1650,8 +1651,7 @@ tools are selected during the Xcode/Developer Tools installation.])
AC_DEFINE(WINCE)
AC_DEFINE(_PR_GLOBAL_THREADS_ONLY)
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=
AR_FLAGS='-NOLOGO -OUT:"$@"'
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
@ -1666,7 +1666,7 @@ tools are selected during the Xcode/Developer Tools installation.])
LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)'
DLLFLAGS='-OUT:"$@"'
if test -n "$MOZ_DEBUG_SYMBOLS"; then
if test -n "$MOZ_DEBUG_SYMBOLS" || test -n "$MOZ_DEBUG"; then
OS_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
OS_DLLFLAGS='-DEBUG -DEBUGTYPE:CV'
DSO_LDOPTS='-DEBUG -DEBUGTYPE:CV'
@ -2403,6 +2403,9 @@ case "$target_os" in
darwin*)
_HAVE_PTHREADS=1
;;
wince*)
_HAVE_PTHREADS=
;;
*)
MOZ_CHECK_PTHREADS(pthreads,
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
@ -2723,7 +2726,7 @@ if test -n "$MOZ_OPTIMIZE"; then
CXXFLAGS="$CXXFLAGS $_OPTIMIZE_FLAGS"
fi
if test -n "$MOZ_DEBUG"; then
if test -n "$MOZ_DEBUG_SYMBOLS" || test -n "$MOZ_DEBUG"; then
CFLAGS="$CFLAGS $_DEBUG_FLAGS"
CXXFLAGS="$CXXFLAGS $_DEBUG_FLAGS"
fi

2
nsprpub/pr/include/md/_freebsd.h
View file

@ -76,7 +76,7 @@
#define USE_DLFCN
#define _PR_HAVE_SOCKADDR_LEN
#define _PR_STAT_HAS_ST_ATIMESPEC
#define _PR_NO_LARGE_FILES
#define _PR_HAVE_LARGE_OFF_T
#if defined(_PR_PTHREADS)
#if __FreeBSD_version >= 400008

6
nsprpub/pr/include/prinit.h
View file

@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.8.4"
#define PR_VERSION "4.8.5 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 8
#define PR_VPATCH 4
#define PR_BETA PR_FALSE
#define PR_VPATCH 5
#define PR_BETA PR_TRUE
/*
** PRVersionCheck

5
nsprpub/pr/src/linking/Makefile.in
View file

@ -62,11 +62,6 @@ TARGETS = $(OBJS)
INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
# On Mac OS X use flat #includes.
ifeq ($(OS_TARGET),MacOSX)
INCLUDES += -I$(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon
endif
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk

19
nsprpub/pr/src/linking/prlink.c
View file

@ -45,15 +45,8 @@
#endif
#if defined(XP_MACOSX) && defined(USE_MACH_DYLD)
#include <CodeFragments.h>
#include <TextUtils.h>
#include <Types.h>
#include <Aliases.h>
#include <CFURL.h>
#include <CFBundle.h>
#include <CFString.h>
#include <CFDictionary.h>
#include <CFData.h>
#include <Carbon/Carbon.h>
#include <CoreFoundation/CoreFoundation.h>
#endif
#ifdef XP_UNIX
@ -621,16 +614,16 @@ pr_LoadCFBundle(const char *name, PRLibrary *lm)
{
CFURLRef bundleURL;
CFBundleRef bundle = NULL;
char pathBuf[PATH_MAX];
const char *resolvedPath;
char *resolvedPath;
CFStringRef pathRef;
/* Takes care of relative paths and symlinks */
resolvedPath = realpath(name, pathBuf);
resolvedPath = realpath(name, NULL);
if (!resolvedPath)
return PR_FAILURE;
pathRef = CFStringCreateWithCString(NULL, pathBuf, kCFStringEncodingUTF8);
pathRef = CFStringCreateWithCString(NULL, resolvedPath, kCFStringEncodingUTF8);
free(resolvedPath);
if (pathRef) {
bundleURL = CFURLCreateWithFileSystemPath(NULL, pathRef,
kCFURLPOSIXPathStyle, true);

8
nsprpub/pr/src/md/windows/ntio.c
View file

@ -2740,20 +2740,20 @@ void FlipSlashes(char *cp, int len)
**
*/
PRStatus
PRInt32
_PR_MD_CLOSE_DIR(_MDDir *d)
{
if ( d ) {
if (FindClose( d->d_hdl )) {
d->magic = (PRUint32)-1;
return PR_SUCCESS;
return 0;
} else {
_PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
return PR_FAILURE;
return -1;
}
}
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return PR_FAILURE;
return -1;
}

16
nsprpub/pr/src/md/windows/w95io.c
View file

@ -673,20 +673,20 @@ static void FlipSlashes(char *cp, size_t len)
**
*/
PRStatus
PRInt32
_PR_MD_CLOSE_DIR(_MDDir *d)
{
if ( d ) {
if (FindClose(d->d_hdl)) {
d->magic = (PRUint32)-1;
return PR_SUCCESS;
return 0;
} else {
_PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
return PR_FAILURE;
return -1;
}
}
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return PR_FAILURE;
return -1;
}
@ -1578,20 +1578,20 @@ _PR_MD_READ_DIR_UTF16(_MDDirUTF16 *d, PRIntn flags)
return NULL;
}
PRStatus
PRInt32
_PR_MD_CLOSE_DIR_UTF16(_MDDirUTF16 *d)
{
if ( d ) {
if (FindClose(d->d_hdl)) {
d->magic = (PRUint32)-1;
return PR_SUCCESS;
return 0;
} else {
_PR_MD_MAP_CLOSEDIR_ERROR(GetLastError());
return PR_FAILURE;
return -1;
}
}
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
return PR_FAILURE;
return -1;
}
#define _PR_IS_W_SLASH(ch) ((ch) == L'/' || (ch) == L'\\')

40
nsprpub/pr/src/misc/dtoa.c
View file

@ -2791,9 +2791,6 @@ strtod
if (e1 &= ~15) {
if (e1 > DBL_MAX_10_EXP) {
ovfl:
#ifndef NO_ERRNO
errno = ERANGE;
#endif
/* Can't trust HUGE_VAL */
#ifdef IEEE_Arith
#ifdef Honor_FLT_ROUNDS
@ -2820,6 +2817,17 @@ strtod
word0(&rv) = Big0;
word1(&rv) = Big1;
#endif /*IEEE_Arith*/
range_err:
if (bd0) {
Bfree(bb);
Bfree(bd);
Bfree(bs);
Bfree(bd0);
Bfree(delta);
}
#ifndef NO_ERRNO
errno = ERANGE;
#endif
goto ret;
}
e1 >>= 4;
@ -2884,10 +2892,7 @@ strtod
if (!dval(&rv)) {
undfl:
dval(&rv) = 0.;
#ifndef NO_ERRNO
errno = ERANGE;
#endif
goto ret;
goto range_err;
}
#ifndef Avoid_Underflow
word0(&rv) = Tiny0;
@ -3123,7 +3128,7 @@ strtod
adj.d *= ulp(&rv);
if (bc.dsign) {
if (word0(&rv) == Big0 && word1(&rv) == Big1)
goto ovflfree;
goto ovfl;
dval(&rv) += adj.d;
}
else
@ -3174,6 +3179,8 @@ strtod
#endif
0xffffffff)) {
/*boundary case -- increment exponent*/
if (word0(&rv) == Big0 && word1(&rv) == Big1)
goto ovfl;
word0(&rv) = (word0(&rv) & Exp_mask)
+ Exp_msk1
#ifdef IBM
@ -3338,17 +3345,8 @@ strtod
dval(&rv) += adj.d;
if ((word0(&rv) & Exp_mask) >=
Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
if (word0(&rv0) == Big0 && word1(&rv0) == Big1) {
#ifdef Honor_FLT_ROUNDS
ovflfree:
#endif
Bfree(bb);
Bfree(bd);
Bfree(bs);
Bfree(bd0);
Bfree(delta);
if (word0(&rv0) == Big0 && word1(&rv0) == Big1)
goto ovfl;
}
word0(&rv) = Big0;
word1(&rv) = Big1;
goto cont;
@ -3468,8 +3466,14 @@ strtod
Bfree(delta);
#ifndef NO_STRTOD_BIGCOMP
if (bc.nd > nd && bc.dsign) {
bd0 = 0;
bc.e0 += nz1;
bigcomp(&rv, s0, &bc);
y = word0(&rv) & Exp_mask;
if (y == Exp_mask)
goto ovfl;
if (y == 0 && rv.d == 0.)
goto undfl;
}
#endif
#ifdef SET_INEXACT

2
nsprpub/pr/tests/op_filok.c
View file

@ -63,6 +63,8 @@
#define EXISTING_FILENAME "z:\\system\\install\\Series60v3.0.sis"
#elif defined (XP_UNIX)
#define EXISTING_FILENAME "/bin/sh"
#elif defined(WINCE)
#define EXISTING_FILENAME "/Windows/services.exe"
#elif defined(WIN32)
#define EXISTING_FILENAME "c:/autoexec.bat"
#elif defined(OS2)

6
nsprpub/pr/tests/vercheck.c
View file

@ -52,9 +52,9 @@
#include <stdlib.h>
/*
* This release (4.8.4) is backward compatible with the
* This release (4.8.5) 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, 4.8.1, 4.8.2, and 4.8.3 releases. It, of course,
* 4.8, 4.8.1, 4.8.2, 4.8.3, and 4.8.4 releases. It, of course,
* is compatible with itself.
*/
static char *compatible_version[] = {
@ -65,7 +65,7 @@ static char *compatible_version[] = {
"4.6.6", "4.6.7", "4.6.8",
"4.7", "4.7.1", "4.7.2", "4.7.3", "4.7.4", "4.7.5",
"4.7.6",
"4.8", "4.8.1", "4.8.2", "4.8.3", PR_VERSION
"4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", PR_VERSION
};
/*