Skip to content

Commit

Permalink
Update NSPR to the NSPR_HEAD_20090828 CVS tag. Contains fixes
Browse files Browse the repository at this point in the history 
for bug 366194, bug 506502, bug 508165, bug 509243, bug 510705,
bug 511315, bug 512806.
  • Loading branch information
@wantehchang
wantehchang committed Aug 29, 2009
1 parent 43fe239 commit e80d61b
Show file tree
Hide file tree
Showing 18 changed files with 201 additions and 127 deletions.
1 change: 0 additions & 1 deletion nsprpub/config/prdepend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@
*/

#error "Do not include this header file."

71 changes: 36 additions & 35 deletions nsprpub/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2788,6 +2788,7 @@ if test -n "$CROSS_COMPILE"; then
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
darwin*) OS_ARCH=Darwin ;;
riscos*) OS_ARCH=RISCOS ;;
esac
else
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
Expand Down Expand Up @@ -2974,17 +2975,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:2978: checking for sys/atomic_op.h" >&5
echo "configure:2979: 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
#line 2983 "configure"
#line 2984 "configure"
#include "confdefs.h"
#include <sys/atomic_op.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2989: \"$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*
Expand Down Expand Up @@ -3141,15 +3142,15 @@ 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:3145: checking for gethostbyaddr in -lbind" >&5
echo "configure:3146: 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
else
ac_save_LIBS="$LIBS"
LIBS="-lbind $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3153 "configure"
#line 3154 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Expand All @@ -3160,7 +3161,7 @@ int main() {
gethostbyaddr()
; return 0; }
EOF
if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3165: \"$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
Expand Down Expand Up @@ -4227,9 +4228,9 @@ EOF

DLLFLAGS='-OUT:"$@"'
if test -n "$MOZ_DEBUG_SYMBOLS"; then
OS_LDFLAGS=-DEBUG -DEBUGTYPE:CV
OS_DLLFLAGS=-DEBUG -DEBUGTYPE:CV
DSO_LDOPTS=-DEBUG -DEBUGTYPE:CV
OS_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
OS_DLLFLAGS='-DEBUG -DEBUGTYPE:CV'
DSO_LDOPTS='-DEBUG -DEBUGTYPE:CV'
fi
_DEBUG_FLAGS=-Zi
_OPTIMIZE_FLAGS=-O2
Expand Down Expand Up @@ -4506,17 +4507,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:4510: checking for machine/builtins.h" >&5
echo "configure:4511: 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
#line 4515 "configure"
#line 4516 "configure"
#include "confdefs.h"
#include <machine/builtins.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4521: \"$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*
Expand Down Expand Up @@ -4605,8 +4606,9 @@ EOF
USE_PTHREADS=1
MDCPUCFG_H=_riscos.cfg
PR_MD_CSRCS=riscos.c
DLL_SUFFIX=a
LD="/home/riscos/env/ro-ar cr"
DSO_CFLAGS=-fPIC
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
;;

*-*-sco*)
Expand Down Expand Up @@ -5132,7 +5134,6 @@ EOF
if test -n "$MOZ_OPTIMIZE"; then
DSO_LDOPTS="$DSO_LDOPTS -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
fi
OS_LIBS="-lsocket"
IMPLIB='emximp -o'
FILTER='emxexp -o'
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
Expand Down Expand Up @@ -5161,19 +5162,19 @@ if test -z "$SKIP_LIBRARY_CHECKS"; then


case $target in
*-darwin*|*-beos*)
*-darwin*|*-beos*|*-os2*)
;;
*)
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:5169: checking for dlopen in -ldl" >&5
echo "configure:5170: 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
else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5177 "configure"
#line 5178 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
Expand All @@ -5184,7 +5185,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo configure:5188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:5189: \"$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
Expand All @@ -5201,17 +5202,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:5205: checking for dlfcn.h" >&5
echo "configure:5206: 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
#line 5210 "configure"
#line 5211 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:5215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:5216: \"$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*
Expand Down Expand Up @@ -5244,13 +5245,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:5248: checking whether ${CC-cc} needs -traditional" >&5
echo "configure:5249: 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 <<EOF
#line 5254 "configure"
#line 5255 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
Expand All @@ -5268,7 +5269,7 @@ rm -f conftest*

if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 5272 "configure"
#line 5273 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
Expand All @@ -5292,12 +5293,12 @@ fi
for ac_func in lchown strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:5296: checking for $ac_func" >&5
echo "configure:5297: 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 <<EOF
#line 5301 "configure"
#line 5302 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
Expand All @@ -5320,7 +5321,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:5325: \"$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
Expand Down Expand Up @@ -5361,7 +5362,7 @@ hpux*)
if test -z "$GNU_CC"; then

echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
echo "configure:5365: checking for +Olit support" >&5
echo "configure:5366: 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
Expand Down Expand Up @@ -5400,7 +5401,7 @@ darwin*)
*)

echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
echo "configure:5404: checking for pthread_create in -lpthreads" >&5
echo "configure:5405: checking for pthread_create in -lpthreads" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
Expand All @@ -5422,7 +5423,7 @@ echo "
echo "$ac_t""no" 1>&6

echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:5426: checking for pthread_create in -lpthread" >&5
echo "configure:5427: checking for pthread_create in -lpthread" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
Expand All @@ -5444,7 +5445,7 @@ echo "
echo "$ac_t""no" 1>&6

echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
echo "configure:5448: checking for pthread_create in -lc_r" >&5
echo "configure:5449: checking for pthread_create in -lc_r" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
Expand All @@ -5466,7 +5467,7 @@ echo "
echo "$ac_t""no" 1>&6

echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
echo "configure:5470: checking for pthread_create in -lc" >&5
echo "configure:5471: checking for pthread_create in -lc" >&5
echo "
#include <pthread.h>
void *foo(void *v) { return v; }
Expand Down Expand Up @@ -5598,7 +5599,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:5602: checking whether ${CC-cc} accepts -pthread" >&5
echo "configure:5603: 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
Expand All @@ -5621,7 +5622,7 @@ echo "configure:5602: 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:5625: checking whether ${CC-cc} accepts -pthreads" >&5
echo "configure:5626: 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
Expand Down
16 changes: 9 additions & 7 deletions nsprpub/configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ if test -n "$CROSS_COMPILE"; then
mingw*) OS_ARCH=WINNT ;;
wince*) OS_ARCH=WINCE ;;
darwin*) OS_ARCH=Darwin ;;
riscos*) OS_ARCH=RISCOS ;;
esac
else
OS_ARCH=`uname -s | sed -e 's|/|_|g'`
Expand Down Expand Up @@ -1679,9 +1680,9 @@ tools are selected during the Xcode/Developer Tools installation.])

DLLFLAGS='-OUT:"$@"'
if test -n "$MOZ_DEBUG_SYMBOLS"; then
OS_LDFLAGS=-DEBUG -DEBUGTYPE:CV
OS_DLLFLAGS=-DEBUG -DEBUGTYPE:CV
DSO_LDOPTS=-DEBUG -DEBUGTYPE:CV
OS_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
OS_DLLFLAGS='-DEBUG -DEBUGTYPE:CV'
DSO_LDOPTS='-DEBUG -DEBUGTYPE:CV'
fi
_DEBUG_FLAGS=-Zi
_OPTIMIZE_FLAGS=-O2
Expand Down Expand Up @@ -1881,8 +1882,9 @@ mips-sony-newsos*)
USE_PTHREADS=1
MDCPUCFG_H=_riscos.cfg
PR_MD_CSRCS=riscos.c
DLL_SUFFIX=a
LD="/home/riscos/env/ro-ar cr"
DSO_CFLAGS=-fPIC
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
;;

*-*-sco*)
Expand Down Expand Up @@ -2229,7 +2231,6 @@ mips-sony-newsos*)
if test -n "$MOZ_OPTIMIZE"; then
DSO_LDOPTS="$DSO_LDOPTS -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
fi
OS_LIBS="-lsocket"
IMPLIB='emximp -o'
FILTER='emxexp -o'
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
Expand Down Expand Up @@ -2279,9 +2280,10 @@ dnl AC_CHECK_LIB(vms_jackets, main)
dnl We don't want anything to link with libdl even if it's present on OS X,
dnl since it's not used and not part of the default installation.
dnl The same goes for BeOS.
dnl OS/2 has dlfcn in libc.

case $target in
*-darwin*|*-beos*)
*-darwin*|*-beos*|*-os2*)
;;
*)
AC_CHECK_LIB(dl, dlopen,
Expand Down
7 changes: 0 additions & 7 deletions nsprpub/lib/ds/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,3 @@ else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
endif
endif
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
endif


5 changes: 0 additions & 5 deletions nsprpub/lib/libc/include/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,3 @@ include $(topsrcdir)/config/rules.mk

export:: $(HEADERS)
$(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
endif


5 changes: 0 additions & 5 deletions nsprpub/lib/libc/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,3 @@ else
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
endif
endif
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
endif

4 changes: 0 additions & 4 deletions nsprpub/lib/msgc/include/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,3 @@ include $(topsrcdir)/config/rules.mk

export:: $(EXPORT_HEADERS)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(dist_includedir)
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(EXPORT_HEADERS) $(MOZ_INCL)
endif

5 changes: 0 additions & 5 deletions nsprpub/lib/msgc/src/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,3 @@ export:: $(TARGETS)
ifdef SHARED_LIBRARY
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
endif
ifeq ($(MOZ_BITS),16)
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/lib
$(INSTALL) -m 444 $(TARGETS) $(MOZ_DIST)/bin
endif

8 changes: 5 additions & 3 deletions nsprpub/pr/include/md/_os2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,12 @@ extern struct PRThread * _MD_CURRENT_THREAD(void);
#define _MD_INIT_STACK(stack, redzone)
#define _MD_CLEAR_STACK(stack)

/* --- Memory-mapped files stuff --- not implemented on OS/2 */

/* --- Memory-mapped files stuff --- */
/* ReadOnly and WriteCopy modes are simulated on OS/2;
* ReadWrite mode is not supported.
*/
struct _MDFileMap {
PRInt8 unused;
PROffset64 maxExtent;
};

extern PRStatus _MD_CreateFileMap(struct PRFileMap *fmap, PRInt64 size);
Expand Down
Loading

0 comments on commit e80d61b

Please sign in to comment.