Commit 344c3e16 authored by Kai Engert's avatar Kai Engert
Browse files

Bug 1372579, uplift NSPR_4_16_BETA1, r=me 

UPGRADE_NSPR_RELEASE
parent 3bc6d736

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_15_RTM
 
NSPR_4_16_BETA1

nsprpub/config/prdepend.h

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ 
 */



#error "Do not include this header file."

nsprpub/configure

+7 −1
Original line number Diff line number Diff line
@@ -2488,7 +2488,7 @@ test -n "$target_alias" && 
  program_prefix=${target_alias}-



MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=15

MOD_MINOR_VERSION=16

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=
@@ -6714,6 +6714,8 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 


    $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h



    $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h



    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"

    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`

    if test "$MOZ_OBJFORMAT" = "elf"; then
@@ -7324,6 +7326,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." 


    $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h



    $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h



    if test -z "$USE_NSPR_THREADS"; then

        USE_PTHREADS=1

    fi
@@ -7380,6 +7384,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." 


    $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h



    $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h



    CFLAGS="$CFLAGS -ansi -Wall"

    CXXFLAGS="$CXXFLAGS -ansi -Wall"

    DLL_SUFFIX=so.1.0

nsprpub/configure.in

+5 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ dnl ======================================================== 
dnl = Defaults

dnl ========================================================

MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=15

MOD_MINOR_VERSION=16

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=
@@ -1389,6 +1389,7 @@ case "$target" in 
    changequote([,])

    if test "$HOST_DARWIN_MAJOR" -ge 15 ; then

        AC_DEFINE(HAS_CONNECTX)

    fi

    AS='$(CC) -x assembler-with-cpp'

    CFLAGS="$CFLAGS -Wall -fno-common"

    case "${target_cpu}" in
@@ -1559,6 +1560,7 @@ tools are selected during the Xcode/Developer Tools installation.]) 
    AC_DEFINE(FREEBSD)

    AC_DEFINE(HAVE_BSD_FLOCK)

    AC_DEFINE(HAVE_SOCKLEN_T)

    AC_DEFINE(HAVE_POINTER_LOCALTIME_R)

    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"

    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`

    if test "$MOZ_OBJFORMAT" = "elf"; then
@@ -2119,6 +2121,7 @@ tools are selected during the Xcode/Developer Tools installation.]) 
    AC_DEFINE(NETBSD)

    AC_DEFINE(HAVE_BSD_FLOCK)

    AC_DEFINE(HAVE_SOCKLEN_T)

    AC_DEFINE(HAVE_POINTER_LOCALTIME_R)

    if test -z "$USE_NSPR_THREADS"; then

        USE_PTHREADS=1

    fi
@@ -2167,6 +2170,7 @@ tools are selected during the Xcode/Developer Tools installation.]) 
    AC_DEFINE(OPENBSD)

    AC_DEFINE(HAVE_BSD_FLOCK)

    AC_DEFINE(HAVE_SOCKLEN_T)

    AC_DEFINE(HAVE_POINTER_LOCALTIME_R)

    CFLAGS="$CFLAGS -ansi -Wall"

    CXXFLAGS="$CXXFLAGS -ansi -Wall"

    DLL_SUFFIX=so.1.0

nsprpub/pr/include/md/_linux.cfg

+3 −0
Original line number Diff line number Diff line
@@ -498,6 +498,9 @@ 


#elif defined(__mips__)



/* For _ABI64 */

#include <sgidefs.h>



#ifdef __MIPSEB__

#define IS_BIG_ENDIAN 1

#undef  IS_LITTLE_ENDIAN