Hello community, here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at Sat Aug 13 17:14:11 CEST 2011.
-------- --- GNOME/mozilla-nspr/mozilla-nspr.changes 2011-05-19 07:32:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/mozilla-nspr/mozilla-nspr.changes 2011-08-12 22:28:25.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 12 20:26:21 UTC 2011 - [email protected] + +- update to 4.8.9 RTM + * no release notes available from upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nspr-4.8.8.tar.bz2 New: ---- nspr-4.8.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-nspr.spec ++++++ --- /var/tmp/diff_new_pack.3yKhzj/_old 2011-08-13 17:13:52.000000000 +0200 +++ /var/tmp/diff_new_pack.3yKhzj/_new 2011-08-13 17:13:52.000000000 +0200 @@ -22,8 +22,8 @@ Name: mozilla-nspr BuildRequires: gcc-c++ pkg-config License: MPLv1.1 or GPLv2+ or LGPLv2.1+ -Version: 4.8.8 -Release: 2 +Version: 4.8.9 +Release: 1 Summary: Netscape Portable Runtime Url: http://www.mozilla.org/projects/nspr/ # bug437293 ++++++ nspr-4.8.8.tar.bz2 -> nspr-4.8.9.tar.bz2 ++++++ ++++ 2369 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh new/nspr-4.8.9/mozilla/nsprpub/admin/repackage.sh --- old/nspr-4.8.8/mozilla/nsprpub/admin/repackage.sh 2011-04-28 07:42:59.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/admin/repackage.sh 2011-08-12 22:17:40.000000000 +0200 @@ -64,10 +64,10 @@ # # ------------------------------------------------------------------ -FROMTOP=/share/builds/components/nspr20/v4.8.8 -TOTOP=./v4.8.8 -NSPRDIR=nspr-4.8.8 -SOURCETAG=NSPR_4_8_8_RTM +FROMTOP=/share/builds/components/nspr20/v4.8.9 +TOTOP=./v4.8.9 +NSPRDIR=nspr-4.8.9 +SOURCETAG=NSPR_4_8_9_RTM # # enumerate Unix object directories on /s/b/c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/build/win32/pgomerge.py new/nspr-4.8.9/mozilla/nsprpub/build/win32/pgomerge.py --- old/nspr-4.8.8/mozilla/nsprpub/build/win32/pgomerge.py 1970-01-01 01:00:00.000000000 +0100 +++ new/nspr-4.8.9/mozilla/nsprpub/build/win32/pgomerge.py 2011-05-03 20:59:06.000000000 +0200 @@ -0,0 +1,40 @@ +#!/usr/bin/python +# Usage: pgomerge.py <binary basename> <dist/bin> +# Gathers .pgc files from dist/bin and merges them into +# $PWD/$basename.pgd using pgomgr, then deletes them. +# No errors if any of these files don't exist. + +import sys, os, os.path, subprocess +if not sys.platform == "win32": + raise Exception("This script was only meant for Windows.") + +def MergePGOFiles(basename, pgddir, pgcdir): + """Merge pgc files produced from an instrumented binary + into the pgd file for the second pass of profile-guided optimization + with MSVC. |basename| is the name of the DLL or EXE without the + extension. |pgddir| is the path that contains <basename>.pgd + (should be the objdir it was built in). |pgcdir| is the path + containing basename!N.pgc files, which is probably dist/bin. + Calls pgomgr to merge each pgc file into the pgd, then deletes + the pgc files.""" + if not os.path.isdir(pgddir) or not os.path.isdir(pgcdir): + return + pgdfile = os.path.abspath(os.path.join(pgddir, basename + ".pgd")) + if not os.path.isfile(pgdfile): + return + for file in os.listdir(pgcdir): + if file.startswith(basename+"!") and file.endswith(".pgc"): + try: + pgcfile = os.path.normpath(os.path.join(pgcdir, file)) + subprocess.call(['pgomgr', '-merge', + pgcfile, + pgdfile]) + os.remove(pgcfile) + except OSError: + pass + +if __name__ == '__main__': + if len(sys.argv) != 3: + print >>sys.stderr, "Usage: pgomerge.py <binary basename> <dist/bin>" + sys.exit(1) + MergePGOFiles(sys.argv[1], os.getcwd(), sys.argv[2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/config/config.mk new/nspr-4.8.9/mozilla/nsprpub/config/config.mk --- old/nspr-4.8.8/mozilla/nsprpub/config/config.mk 2010-07-23 21:01:00.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/config/config.mk 2011-08-12 22:17:40.000000000 +0200 @@ -78,11 +78,13 @@ ifdef MOZ_PROFILE_GENERATE CFLAGS += $(PROFILE_GEN_CFLAGS) LDFLAGS += $(PROFILE_GEN_LDFLAGS) +DLLFLAGS += $(PROFILE_GEN_LDFLAGS) endif # MOZ_PROFILE_GENERATE ifdef MOZ_PROFILE_USE CFLAGS += $(PROFILE_USE_CFLAGS) LDFLAGS += $(PROFILE_USE_LDFLAGS) +DLLFLAGS += $(PROFILE_USE_LDFLAGS) endif # MOZ_PROFILE_USE define MAKE_OBJDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/config/rules.mk new/nspr-4.8.9/mozilla/nsprpub/config/rules.mk --- old/nspr-4.8.8/mozilla/nsprpub/config/rules.mk 2011-01-09 23:24:20.000000000 +0100 +++ new/nspr-4.8.9/mozilla/nsprpub/config/rules.mk 2011-08-12 22:17:40.000000000 +0200 @@ -280,6 +280,13 @@ $(PROGRAM): $(OBJS) @$(MAKE_OBJDIR) ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) +ifdef MOZ_PROFILE_USE +# In the second pass, we need to merge the pgc files into the pgd file. +# The compiler would do this for us automatically if they were in the right +# place, but they're in dist/bin. + python $(topsrcdir)/build/win32/pgomerge.py \ + $(notdir $(PROGRAM:.exe=)) $(DIST)/bin +endif # MOZ_PROFILE_USE $(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) ifdef MT @if test -f [email protected]; then \ @@ -287,6 +294,11 @@ rm -f [email protected]; \ fi endif # MSVC with manifest tool +ifdef MOZ_PROFILE_GENERATE +# touch it a few seconds into the future to work around FAT's +# 2-second granularity + touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink +endif # MOZ_PROFILE_GENERATE else # WINNT && !GCC $(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) endif # WINNT && !GCC @@ -326,6 +338,10 @@ -bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS) else # AIX 4.1 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) +ifdef MOZ_PROFILE_USE + python $(topsrcdir)/build/win32/pgomerge.py \ + $(notdir $(SHARED_LIBRARY:.$(DLL_SUFFIX)=)) $(DIST)/bin +endif # MOZ_PROFILE_USE $(LINK_DLL) -MAP $(DLLBASE) $(DLL_LIBS) $(EXTRA_LIBS) $(OBJS) $(RES) ifdef MT @if test -f [email protected]; then \ @@ -333,6 +349,9 @@ rm -f [email protected]; \ fi endif # MSVC with manifest tool +ifdef MOZ_PROFILE_GENERATE + touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink +endif # MOZ_PROFILE_GENERATE else # WINNT && !GCC $(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS) endif # WINNT && !GCC @@ -341,6 +360,32 @@ $(STRIP) $@ endif +################################################################################ + +ifdef MOZ_PROFILE_USE +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) +# When building with PGO, we have to make sure to re-link +# in the MOZ_PROFILE_USE phase if we linked in the +# MOZ_PROFILE_GENERATE phase. We'll touch this pgo.relink +# file in the link rule in the GENERATE phase to indicate +# that we need a relink. +$(SHARED_LIBRARY): pgo.relink + +$(PROGRAM): pgo.relink + +endif # WINNT && !GCC +endif # MOZ_PROFILE_USE + +################################################################################ + +ifdef MOZ_PROFILE_GENERATE +# Clean up profiling data during PROFILE_GENERATE phase +export:: + -$(RM) *.pgd *.gcda +endif + +################################################################################ + ifeq ($(OS_ARCH),WINNT) $(RES): $(RESNAME) @$(MAKE_OBJDIR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/configure.in new/nspr-4.8.9/mozilla/nsprpub/configure.in --- old/nspr-4.8.8/mozilla/nsprpub/configure.in 2011-05-19 07:26:17.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/configure.in 2011-08-12 22:17:40.000000000 +0200 @@ -50,7 +50,7 @@ dnl ======================================================== MOD_MAJOR_VERSION=4 MOD_MINOR_VERSION=8 -MOD_PATCH_VERSION=8 +MOD_PATCH_VERSION=9 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= @@ -78,7 +78,6 @@ NEXT_ROOT= MT= MOZ_OS2_HIGH_MEMORY=1 -MOZ_THUMB2= PROFILE_GEN_CFLAGS= PROFILE_GEN_LDFLAGS= PROFILE_USE_CFLAGS= @@ -152,7 +151,20 @@ location of platform dir, default NDK/build/platforms/android-5/arch-arm], android_platform=$withval) -if test "$target" = "arm-android-eabi" ; then +case "$target" in +arm-linux*-android*|*-linuxandroid*) + android_tool_prefix="arm-linux-androideabi" + ;; +arm-android-eabi) + android_tool_prefix="arm-eabi" + ;; +*) + android_tool_prefix="$target_os" + ;; +esac + +case "$target" in +*-android*|*-linuxandroid*) if test -z "$android_ndk" ; then AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.]) fi @@ -166,14 +178,14 @@ fi dnl set up compilers - AS="$android_toolchain"/bin/arm-eabi-as - CC="$android_toolchain"/bin/arm-eabi-gcc - CXX="$android_toolchain"/bin/arm-eabi-g++ - CPP="$android_toolchain"/bin/arm-eabi-cpp - LD="$android_toolchain"/bin/arm-eabi-ld - AR="$android_toolchain"/bin/arm-eabi-ar - RANLIB="$android_toolchain"/bin/arm-eabi-ranlib - STRIP="$android_toolchain"/bin/arm-eabi-strip + AS="$android_toolchain"/bin/"$android_tool_prefix"-as + CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc + CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++ + CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp + LD="$android_toolchain"/bin/"$android_tool_prefix"-ld + AR="$android_toolchain"/bin/"$android_tool_prefix"-ar + RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib + STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS" CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS" @@ -197,7 +209,8 @@ WRAP_MALLOC_CFLAGS="-Wl,--wrap=dlopen -Wl,--wrap=dlclose -Wl,--wrap=dlerror -Wl,--wrap=dlsym -Wl,--wrap=dladdr" AC_DEFINE(ANDROID) -fi + ;; +esac dnl ======================================================== dnl = @@ -663,7 +676,7 @@ if test $result = "yes"; then PROFILE_GEN_LDFLAGS="-fprofile-generate" - PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freorder-blocks-and-partition" + PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch" PROFILE_USE_LDFLAGS="-fprofile-use" fi @@ -913,39 +926,167 @@ fi ]) dnl ======================================================== -dnl = Enable building the Thumb2 instruction set +dnl = ARM toolchain tweaks dnl ======================================================== -AC_ARG_ENABLE(thumb2, - [ --enable-thumb2 Enable Thumb-2 instruction set], - [ if test "$enableval" = "yes"; then - MOZ_THUMB2=1, - fi ]) - -if test -n "$MOZ_THUMB2"; then - case "$target_cpu" in - arm*) - if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv7-a -mthumb" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb" - ASFLAGS="$ASFLAGS -march=armv7-a -mthumb" - else - AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains]) - fi + +dnl Defaults +case "${CPU_ARCH}-${OS_TARGET}" in +arm-Android) + MOZ_THUMB=yes + MOZ_ARCH=armv7-a + MOZ_FPU=vfp + MOZ_FLOAT_ABI=softfp + ;; +arm-*) + if test -n "$MOZ_PLATFORM_MAEMO"; then + MOZ_THUMB=no + MOZ_ARCH=armv7-a + MOZ_FLOAT_ABI=softfp + fi + if test "$MOZ_PLATFORM_MAEMO" = 6; then + MOZ_THUMB=yes + fi ;; - *) - AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures]) +esac + +dnl Kept for compatibility with some buildbot mozconfig +AC_ARG_ENABLE(thumb2, [], MOZ_THUMB=$enableval) + +AC_ARG_WITH(thumb, +[ --with-thumb[[=yes|no|toolchain-default]]] +[ Use Thumb instruction set (-mthumb)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-thumb is not supported on non-GNU toolchain-defaults]) + fi + MOZ_THUMB=$withval) + +AC_ARG_WITH(thumb-interwork, +[ --with-thumb-interwork[[=yes|no|toolchain-default]] + Use Thumb/ARM instuctions interwork (-mthumb-interwork)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-thumb-interwork is not supported on non-GNU toolchain-defaults]) + fi + MOZ_THUMB_INTERWORK=$withval) + +AC_ARG_WITH(arch, +[ --with-arch=[[type|toolchain-default]] + Use specific CPU features (-march=type)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-arch is not supported on non-GNU toolchain-defaults]) + fi + MOZ_ARCH=$withval) + +AC_ARG_WITH(fpu, +[ --with-fpu=[[type|toolchain-default]] + Use specific FPU type (-mfpu=type)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-fpu is not supported on non-GNU toolchain-defaults]) + fi + MOZ_FPU=$withval) + +AC_ARG_WITH(float-abi, +[ --with-float-abi=[[type|toolchain-default]] + Use specific arm float ABI (-mfloat-abi=type)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-float-abi is not supported on non-GNU toolchain-defaults]) + fi + MOZ_FLOAT_ABI=$withval) + +AC_ARG_WITH(soft-float, +[ --with-soft-float[[=yes|no|toolchain-default]] + Use soft float library (-msoft-float)], + if test -z "$GNU_CC"; then + AC_MSG_ERROR([--with-soft-float is not supported on non-GNU toolchain-defaults]) + fi + MOZ_SOFT_FLOAT=$withval) + +case "$MOZ_ARCH" in +toolchain-default|"") + arch_flag="" ;; - esac -else - case "$target" in - arm-android-eabi) - if test "$GNU_CC"; then - CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork" - CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork" - ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork" - fi - ;; - esac +*) + arch_flag="-march=$MOZ_ARCH" + ;; +esac + +case "$MOZ_THUMB" in +yes) + MOZ_THUMB2=1 + thumb_flag="-mthumb" + ;; +no) + MOZ_THUMB2= + thumb_flag="-marm" + ;; +*) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$arch_flag" + AC_TRY_COMPILE([],[return sizeof(__thumb2__);], + MOZ_THUMB2=1, + MOZ_THUMB2=) + CFLAGS="$_SAVE_CFLAGS" + thumb_flag="" + ;; +esac + +case "$MOZ_THUMB_INTERWORK" in +yes) + thumb_interwork_flag="-mthumb-interwork" + ;; +no) + thumb_interwork_flag="-mno-thumb-interwork" + ;; +*) # toolchain-default + thumb_interwork_flag="" + ;; +esac + +case "$MOZ_FPU" in +toolchain-default|"") + fpu_flag="" + ;; +*) + fpu_flag="-mfpu=$MOZ_FPU" + ;; +esac + +case "$MOZ_FLOAT_ABI" in +toolchain-default|"") + float_abi_flag="" + ;; +*) + float_abi_flag="-mfloat-abi=$MOZ_FLOAT_ABI" + ;; +esac + +case "$MOZ_SOFT_FLOAT" in +yes) + soft_float_flag="-msoft-float" + ;; +no) + soft_float_flag="-mno-soft-float" + ;; +*) # toolchain-default + soft_float_flag="" + ;; +esac + +dnl Use echo to avoid accumulating space characters +all_flags=`echo $arch_flag $thumb_flag $thumb_interwork_flag $fpu_flag $float_abi_flag $soft_float_flag` +if test -n "$all_flags"; then + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$all_flags" + AC_MSG_CHECKING(whether the chosen combination of compiler flags ($all_flags) works) + AC_TRY_COMPILE([],[return 0;], + AC_MSG_RESULT([yes]), + AC_MSG_ERROR([no])) + + CFLAGS="$_SAVE_CFLAGS $all_flags" + CXXFLAGS="$CXXFLAGS $all_flags" + ASFLAGS="$ASFLAGS $all_flags" + if test -n "$thumb_flag"; then + LDFLAGS="$LDFLAGS $thumb_flag" + fi fi dnl ======================================================== @@ -1036,6 +1177,33 @@ RESOLVE_LINK_SYMBOLS=1 ;; +*-android*|*-linuxandroid*) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + IMPL_STRATEGY=_PTH + fi + AC_DEFINE(XP_UNIX) + AC_DEFINE(_GNU_SOURCE) + AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) + AC_DEFINE(LINUX) + CFLAGS="$CFLAGS -Wall" + CXXFLAGS="$CXXFLAGS -Wall" + MDCPUCFG_H=_linux.cfg + PR_MD_CSRCS=linux.c + MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@' + DSO_CFLAGS=-fPIC + DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' + _OPTIMIZE_FLAGS=-O2 + _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + # combo is not yet good at debugging inlined + # functions (even when using DWARF2 as the + # debugging format) + COMPILER_TAG=_glibc + CPU_ARCH=arm + CPU_ARCH_TAG=_arm + OS_TARGET=Android + ;; + *-beos*) AC_DEFINE(XP_BEOS) AC_DEFINE(BeOS) @@ -1141,7 +1309,6 @@ i*86*) if test -n "$USE_64"; then CPU_ARCH=x86_64 - CC="$CC -arch x86_64" else CPU_ARCH=i386 fi @@ -1150,6 +1317,9 @@ CPU_ARCH=ppc ;; esac + if test "`echo $CC | grep -c '\-arch '`" = "0"; then + CC="$CC -arch $CPU_ARCH" + fi DSO_CFLAGS=-fPIC DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' _OPTIMIZE_FLAGS=-O2 @@ -1561,33 +1731,6 @@ esac ;; -arm-android-eabi) - if test -z "$USE_NSPR_THREADS"; then - USE_PTHREADS=1 - IMPL_STRATEGY=_PTH - fi - AC_DEFINE(XP_UNIX) - AC_DEFINE(_GNU_SOURCE) - AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) - AC_DEFINE(LINUX) - CFLAGS="$CFLAGS -Wall" - CXXFLAGS="$CXXFLAGS -Wall" - MDCPUCFG_H=_linux.cfg - PR_MD_CSRCS=linux.c - MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@' - DSO_CFLAGS=-fPIC - DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' - _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that - # combo is not yet good at debugging inlined - # functions (even when using DWARF2 as the - # debugging format) - COMPILER_TAG=_glibc - CPU_ARCH=arm - CPU_ARCH_TAG=_arm - OS_TARGET=Android - ;; - *-linux*|*-gnu*|*-k*bsd*-gnu) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 @@ -1669,8 +1812,8 @@ RESOLVE_LINK_SYMBOLS=1 if test -n "$GNU_CC"; then - CC="$CC -mno-cygwin" - CXX="$CXX -mno-cygwin" + CC="$CC -mwindows" + CXX="$CXX -mwindows" DLL_SUFFIX=dll MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' RC=$WINDRES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarenas.h new/nspr-4.8.9/mozilla/nsprpub/lib/ds/plarenas.h --- old/nspr-4.8.8/mozilla/nsprpub/lib/ds/plarenas.h 2010-07-23 21:01:00.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/lib/ds/plarenas.h 2011-08-12 22:17:40.000000000 +0200 @@ -35,8 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -#if defined(PLARENAS_H) -#else /* defined(PLARENAS_H) */ +#ifndef PLARENAS_H #define PLARENAS_H PR_BEGIN_EXTERN_C @@ -44,32 +43,6 @@ typedef struct PLArenaPool PLArenaPool; /* -** Allocate an arena pool as specified by the parameters. -** -** This is equivelant to allocating the space yourself and then -** calling PL_InitArenaPool(). -** -** This function may fail (and return a NULL) for a variety of -** reasons. The reason for a particular failure can be discovered -** by calling PR_GetError(). -*/ -#if 0 /* Not implemented */ -PR_EXTERN(PLArenaPool*) PL_AllocArenaPool( - const char *name, PRUint32 size, PRUint32 align); -#endif - -/* -** Destroy an arena pool previously allocated by PL_AllocArenaPool(). -** -** This function may fail if the arena is not empty and the caller -** wishes to check for empty upon descruction. -*/ -#if 0 /* Not implemented */ -PR_EXTERN(PRStatus) PL_DestroyArenaPool(PLArenaPool *pool, PRBool checkEmpty); -#endif - - -/* ** Initialize an arena pool with the given name for debugging and metering, ** with a minimum size per arena of size bytes. **/ @@ -95,6 +68,7 @@ /* ** Compact all of the arenas in a pool so that no space is wasted. +** NOT IMPLEMENTED. Do not use. **/ PR_EXTERN(void) PL_CompactArenaPool(PLArenaPool *pool); @@ -115,6 +89,4 @@ PR_END_EXTERN_C -#endif /* defined(PLARENAS_H) */ - -/* plarenas */ +#endif /* PLARENAS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h new/nspr-4.8.9/mozilla/nsprpub/pr/include/pratom.h --- old/nspr-4.8.8/mozilla/nsprpub/pr/include/pratom.h 2011-04-28 07:42:59.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/include/pratom.h 2011-08-12 22:17:40.000000000 +0200 @@ -133,9 +133,9 @@ (_InterlockedExchangeAdd((long volatile *)(ptr), (long)(val)) + (val)) #elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && \ - ((defined(DARWIN) && \ + ((defined(__APPLE__) && \ (defined(__ppc__) || defined(__i386__) || defined(__x86_64__))) || \ - (defined(LINUX) && \ + (defined(__linux__) && \ ((defined(__i386__) && \ defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \ defined(__ia64__) || defined(__x86_64__) || \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h new/nspr-4.8.9/mozilla/nsprpub/pr/include/prinit.h --- old/nspr-4.8.8/mozilla/nsprpub/pr/include/prinit.h 2011-05-19 07:26:17.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/include/prinit.h 2011-08-12 22:17:40.000000000 +0200 @@ -63,10 +63,10 @@ ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.8.8" +#define PR_VERSION "4.8.9" #define PR_VMAJOR 4 #define PR_VMINOR 8 -#define PR_VPATCH 8 +#define PR_VPATCH 9 #define PR_BETA PR_FALSE /* @@ -97,6 +97,11 @@ NSPR_API(PRBool) PR_VersionCheck(const char *importedVersion); +/* + * Returns a const string of the NSPR library version. + */ +NSPR_API(const char*) PR_GetVersion(void); + /************************************************************************/ /*******************************INITIALIZATION***************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/include/prtime.h new/nspr-4.8.9/mozilla/nsprpub/pr/include/prtime.h --- old/nspr-4.8.8/mozilla/nsprpub/pr/include/prtime.h 2009-05-20 21:54:24.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/include/prtime.h 2011-08-12 22:17:40.000000000 +0200 @@ -56,11 +56,11 @@ /************************* TYPES AND CONSTANTS ************************/ /**********************************************************************/ -#define PR_MSEC_PER_SEC 1000UL -#define PR_USEC_PER_SEC 1000000UL -#define PR_NSEC_PER_SEC 1000000000UL -#define PR_USEC_PER_MSEC 1000UL -#define PR_NSEC_PER_MSEC 1000000UL +#define PR_MSEC_PER_SEC 1000L +#define PR_USEC_PER_SEC 1000000L +#define PR_NSEC_PER_SEC 1000000000L +#define PR_USEC_PER_MSEC 1000L +#define PR_NSEC_PER_MSEC 1000000L /* * PRTime -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h new/nspr-4.8.9/mozilla/nsprpub/pr/include/prtypes.h --- old/nspr-4.8.8/mozilla/nsprpub/pr/include/prtypes.h 2011-04-28 07:42:59.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/include/prtypes.h 2011-08-12 22:17:40.000000000 +0200 @@ -228,6 +228,13 @@ #define PR_MAX(x,y) ((x)>(y)?(x):(y)) #define PR_ABS(x) ((x)<0?-(x):(x)) +/*********************************************************************** +** MACROS: PR_ARRAY_SIZE +** DESCRIPTION: +** The number of elements in an array. +***********************************************************************/ +#define PR_ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + PR_BEGIN_EXTERN_C /************************************************************************ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/src/md/windows/w95sock.c new/nspr-4.8.9/mozilla/nsprpub/pr/src/md/windows/w95sock.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/src/md/windows/w95sock.c 2010-03-05 07:26:28.000000000 +0100 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/src/md/windows/w95sock.c 2011-08-12 22:17:40.000000000 +0200 @@ -107,6 +107,7 @@ static HMODULE libWinsock2 = NULL; static WSAIOCTLPROC wsaioctlProc = NULL; static PRBool socketSetCompatMode = PR_FALSE; +static PRBool socketFixInet6RcvBuf = PR_FALSE; void _PR_MD_InitSockets(void) { @@ -130,6 +131,11 @@ } } } + else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + { + /* if Windows XP (32-bit) */ + socketFixInet6RcvBuf = PR_TRUE; + } } void _PR_MD_CleanupSockets(void) @@ -190,6 +196,27 @@ } } + if (af == AF_INET6 && socketFixInet6RcvBuf) + { + int bufsize; + int len = sizeof(bufsize); + int rv; + + /* Windows XP 32-bit returns an error on getpeername() for AF_INET6 + * sockets if the receive buffer size is greater than 65535 before + * the connection is initiated. The default receive buffer size may + * be 128000 so fix it here to always be <= 65535. See bug 513659 + * and IBM DB2 support technote "Receive/Send IPv6 Socket Size + * Problem in Windows XP SP2 & SP3". + */ + rv = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*)&bufsize, &len); + if (rv == 0 && bufsize > 65535) + { + bufsize = 65535; + setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*)&bufsize, len); + } + } + return (PROsfd)sock; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prinit.c new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prinit.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prinit.c 2010-12-09 15:34:05.000000000 +0100 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prinit.c 2011-08-12 22:17:40.000000000 +0200 @@ -137,6 +137,10 @@ return PR_TRUE; } /* PR_VersionCheck */ +PR_IMPLEMENT(const char*) PR_GetVersion(void) +{ + return PR_VERSION; +} PR_IMPLEMENT(PRBool) PR_Initialized(void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prnetdb.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prnetdb.c 2011-04-28 07:43:00.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prnetdb.c 2011-08-12 22:17:40.000000000 +0200 @@ -2077,6 +2077,12 @@ hints.ai_socktype = SOCK_STREAM; rv = GETADDRINFO(hostname, NULL, &hints, &res); +#ifdef AI_ADDRCONFIG + if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) { + hints.ai_flags &= ~AI_ADDRCONFIG; + rv = GETADDRINFO(hostname, NULL, &hints, &res); + } +#endif if (rv == 0) return (PRAddrInfo *) res; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prsystem.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/src/misc/prsystem.c 2011-04-28 07:43:00.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/src/misc/prsystem.c 2011-08-12 22:17:40.000000000 +0200 @@ -77,6 +77,12 @@ #include <sys/utsname.h> #endif +#if defined(LINUX) +#include <string.h> +#include <ctype.h> +#define MAX_LINE 512 +#endif + #if defined(AIX) #include <cf.h> #include <sys/cfgodm.h> @@ -255,8 +261,41 @@ numCpus = sysconf( _SC_NPROC_ONLN ); #elif defined(RISCOS) || defined(SYMBIAN) numCpus = 1; +#elif defined(LINUX) + /* for the benefit of devices with advanced power-saving, that + actually hotplug their cpus in heavy load, try to figure out + the real number of CPUs */ + char buf[MAX_LINE]; + FILE *fin; + const char *cpu_present = "/sys/devices/system/cpu/present"; + size_t strsize; + numCpus = 0; + fin = fopen(cpu_present, "r"); + if (fin != NULL) { + if (fgets(buf, MAX_LINE, fin) != NULL) { + /* check that the format is what we expect */ + if (buf[0] == '0') { + strsize = strlen(buf); + if (strsize == 1) { + /* single core */ + numCpus = 1; + } else if (strsize >= 3 && strsize <= 5) { + /* should be of the form 0-999 */ + /* parse the part after the 0-, note count is 0-based */ + if (buf[1] == '-' && isdigit(buf[2])) { + numCpus = 1 + atoi(buf + 2); + } + } + } + } + fclose(fin); + } + /* if that fails, fall back to more standard methods */ + if (!numCpus) { + numCpus = sysconf( _SC_NPROCESSORS_CONF ); + } #elif defined(XP_UNIX) - numCpus = sysconf( _SC_NPROCESSORS_ONLN ); + numCpus = sysconf( _SC_NPROCESSORS_CONF ); #else #error "An implementation is required" #endif @@ -282,7 +321,8 @@ long pageSize = sysconf(_SC_PAGESIZE); long pageCount = sysconf(_SC_PHYS_PAGES); - bytes = (PRUint64) pageSize * pageCount; + if (pageSize >= 0 && pageCount >= 0) + bytes = (PRUint64) pageSize * pageCount; #elif defined(NETBSD) || defined(OPENBSD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/src/nspr.def new/nspr-4.8.9/mozilla/nsprpub/pr/src/nspr.def --- old/nspr-4.8.8/mozilla/nsprpub/pr/src/nspr.def 2009-05-20 21:54:25.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/src/nspr.def 2011-08-12 22:17:40.000000000 +0200 @@ -474,3 +474,7 @@ PR_AssertCurrentThreadOwnsLock; PR_AssertCurrentThreadInMonitor; ;+} NSPR_4.7; +;+NSPR_4.8.9 { +;+ global: + PR_GetVersion; +;+} NSPR_4.8; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/tests/sprintf.c new/nspr-4.8.9/mozilla/nsprpub/pr/tests/sprintf.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/tests/sprintf.c 2009-05-20 21:54:26.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/tests/sprintf.c 2011-08-12 22:17:40.000000000 +0200 @@ -56,8 +56,6 @@ #include <stdio.h> #include <stdlib.h> -#define countof(a) (sizeof(a)/sizeof(a[0])) - static char sbuf[20000]; @@ -121,15 +119,15 @@ int f, s, n, p; char fmt[20]; - for (f = 0; f < countof(formats); f++) { - for (s = 0; s < countof(signs); s++) { - for (p = 0; p < countof(precs); p++) { + for (f = 0; f < PR_ARRAY_SIZE(formats); f++) { + for (s = 0; s < PR_ARRAY_SIZE(signs); s++) { + for (p = 0; p < PR_ARRAY_SIZE(precs); p++) { fmt[0] = '%'; fmt[1] = 0; if (signs[s]) strcat(fmt, signs[s]); if (precs[p]) strcat(fmt, precs[p]); if (formats[f]) strcat(fmt, formats[f]); - for (n = 0; n < countof(nums); n++) { + for (n = 0; n < PR_ARRAY_SIZE(nums); n++) { test_i(fmt, nums[n]); } } @@ -213,9 +211,9 @@ int f, s, n, p; char fmt[40], sfmt[40]; - for (f = 0; f < countof(formats); f++) { - for (s = 0; s < countof(signs); s++) { - for (p = 0; p < countof(precs); p++) { + for (f = 0; f < PR_ARRAY_SIZE(formats); f++) { + for (s = 0; s < PR_ARRAY_SIZE(signs); s++) { + for (p = 0; p < PR_ARRAY_SIZE(precs); p++) { fmt[0] = '%'; fmt[1] = 0; if (signs[s]) strcat(fmt, signs[s]); @@ -223,7 +221,7 @@ strcpy(sfmt, fmt); if (formats[f]) strcat(fmt, formats[f]); if (sformats[f]) strcat(sfmt, sformats[f]); - for (n = 0; n < countof(nums); n++) { + for (n = 0; n < PR_ARRAY_SIZE(nums); n++) { test_l(fmt, sfmt, nums[n]); } } @@ -336,9 +334,9 @@ int f, s, n, p; char fmt[40], sfmt[40]; - for (f = 0; f < countof(formats); f++) { - for (s = 0; s < countof(signs); s++) { - for (p = 0; p < countof(precs); p++) { + for (f = 0; f < PR_ARRAY_SIZE(formats); f++) { + for (s = 0; s < PR_ARRAY_SIZE(signs); s++) { + for (p = 0; p < PR_ARRAY_SIZE(precs); p++) { fmt[0] = '%'; fmt[1] = 0; if (signs[s]) strcat(fmt, signs[s]); @@ -346,7 +344,7 @@ strcpy(sfmt, fmt); if (formats[f]) strcat(fmt, formats[f]); if (sformats[f]) strcat(sfmt, sformats[f]); - for (n = 0; n < countof(nums); n++) { + for (n = 0; n < PR_ARRAY_SIZE(nums); n++) { test_ll(fmt, sfmt, nums[n]); } } @@ -424,15 +422,15 @@ int f, s, n, p; char fmt[40]; - for (f = 0; f < countof(formats); f++) { - for (s = 0; s < countof(signs); s++) { - for (p = 0; p < countof(precs); p++) { + for (f = 0; f < PR_ARRAY_SIZE(formats); f++) { + for (s = 0; s < PR_ARRAY_SIZE(signs); s++) { + for (p = 0; p < PR_ARRAY_SIZE(precs); p++) { fmt[0] = '%'; fmt[1] = 0; if (signs[s]) strcat(fmt+strlen(fmt), signs[s]); if (precs[p]) strcat(fmt+strlen(fmt), precs[p]); if (formats[f]) strcat(fmt+strlen(fmt), formats[f]); - for (n = 0; n < countof(strs); n++) { + for (n = 0; n < PR_ARRAY_SIZE(strs); n++) { test_s(fmt, strs[n]); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c new/nspr-4.8.9/mozilla/nsprpub/pr/tests/vercheck.c --- old/nspr-4.8.8/mozilla/nsprpub/pr/tests/vercheck.c 2011-04-28 07:43:00.000000000 +0200 +++ new/nspr-4.8.9/mozilla/nsprpub/pr/tests/vercheck.c 2011-08-12 22:17:40.000000000 +0200 @@ -52,10 +52,10 @@ #include <stdlib.h> /* - * This release (4.8.8) is backward compatible with the + * This release (4.8.9) 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, 4.8.3, 4.8.4, 4.8.5, 4.8.6 and 4.8.7 releases. - * It, of course, is compatible with itself. + * 4.8, 4.8.1, 4.8.2, 4.8.3, 4.8.4, 4.8.5, 4.8.6, 4.8.7, and + * 4.8.8 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", @@ -66,7 +66,7 @@ "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", "4.8.4", "4.8.5", - "4.8.6", "4.8.7", PR_VERSION + "4.8.6", "4.8.7", "4.8.8", PR_VERSION }; /* @@ -81,7 +81,7 @@ "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.8.9", + "4.8.10", "4.9", "4.9.1", "10.0", "11.1", "12.14.20" }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/nspr-4.8.8/mozilla/nsprpub/tools/httpget.c new/nspr-4.8.9/mozilla/nsprpub/tools/httpget.c --- old/nspr-4.8.8/mozilla/nsprpub/tools/httpget.c 2008-01-21 10:52:48.000000000 +0100 +++ new/nspr-4.8.9/mozilla/nsprpub/tools/httpget.c 2011-08-12 22:17:40.000000000 +0200 @@ -201,14 +201,13 @@ outfMap = PR_CreateFileMap(out, sz64, PR_PROT_READWRITE); PR_ASSERT(outfMap); addr = PR_MemMap(outfMap, LL_ZERO, size); - if (addr == (void *) -1) { + if (addr == NULL) { fprintf(stderr, "cannot memory-map file: (%d, %d)\n", PR_GetError(), PR_GetOSError()); PR_CloseFileMap(outfMap); return PR_FAILURE; } - PR_ASSERT(addr != (void *) -1); start = (char *) addr; rem = size; while ((nBytes = DrainInputBuffer(start, rem)) > 0) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
