Bug 713936, Part 3: Update to NSPR 4.9 RTM (NSPR_4_9_RTM), r=kaie, a=akeybl
authorBrian Smith <bsmith@mozilla.com>
Fri, 17 Feb 2012 15:09:25 -0800
changeset 87214 57a4882d9b7885a0113e54d4e2fbf1dd8d2a1d26
parent 87213 2c9869ab7175fee267c6d2a508ae04d0520a5b58
child 87215 dfb7c3567c492805465fe1ebf01a52e5e0f5fa1e
push id874
push userbsmith@mozilla.com
push dateFri, 17 Feb 2012 23:10:09 +0000
treeherdermozilla-aurora@57a4882d9b78 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaie, akeybl
bugs713936
milestone12.0a2
Bug 713936, Part 3: Update to NSPR 4.9 RTM (NSPR_4_9_RTM), r=kaie, a=akeybl
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/configure
nsprpub/configure.in
nsprpub/pr/include/prinit.h
nsprpub/pr/include/prtypes.h
nsprpub/pr/tests/sprintf.c
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_9_BETA6
+NSPR_4_9_RTM
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -37,9 +37,8 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
-
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -5844,18 +5844,18 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-_SAVE_LDFLAGS="$LDFLAGS"
-LDFLAGS="$OS_LIBS"
+_SAVE_LIBS="$LIBS"
+LIBS="$LIBS $OS_LIBS"
 for ac_func in lchown strerror dladdr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:5858: 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
@@ -5901,17 +5901,17 @@ if eval "test \"`echo '$ac_cv_func_'$ac_
 #define $ac_tr_func 1
 EOF
  
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
-LDFLAGS="$_SAVE_LDFLAGS"
+LIBS="$_SAVE_LIBS"
 
 
 
 # Check whether --with-ccache or --without-ccache was given.
 if test "${with_ccache+set}" = set; then
   withval="$with_ccache"
   CCACHE=$withval
 else
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -2736,20 +2736,20 @@ dnl AC_STRUCT_ST_BLOCKS
 dnl AC_STRUCT_ST_RDEV
 dnl AC_HEADER_TIME
 dnl AC_STRUCT_TM
 
 dnl ========================================================
 dnl Checks for library functions.
 dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
-_SAVE_LDFLAGS="$LDFLAGS"
-LDFLAGS="$OS_LIBS"
+_SAVE_LIBS="$LIBS"
+LIBS="$LIBS $OS_LIBS"
 AC_CHECK_FUNCS(lchown strerror dladdr)
-LDFLAGS="$_SAVE_LDFLAGS"
+LIBS="$_SAVE_LIBS"
 
 dnl AC_FUNC_MEMCMP
 dnl AC_FUNC_MMAP
 dnl AC_FUNC_SETVBUF_REVERSED
 dnl AC_FUNC_STRCOLL
 dnl AC_FUNC_STRFTIME
 dnl AC_FUNC_UTIME_NULL
 dnl AC_FUNC_VPRINTF
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -58,21 +58,21 @@ PR_BEGIN_EXTERN_C
 /*
 ** NSPR's version is used to determine the likelihood that the version you
 ** used to build your component is anywhere close to being compatible with
 ** what is in the underlying library.
 **
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.9 Beta"
+#define PR_VERSION  "4.9"
 #define PR_VMAJOR   4
 #define PR_VMINOR   9
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
 **
 ** The basic signature of the function that is called to provide version
 ** checking. The result will be a boolean that indicates the likelihood
 ** that the underling library will perform as the caller expects.
 **
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -349,16 +349,22 @@ typedef long PRInt32;
 ** DESCRIPTION:
 **  The PR_INT64 and PR_UINT64 macros provide a portable way for
 **      specifying 64-bit integer constants. They can only be used if
 **      PRInt64 and PRUint64 are defined as compiler-supported 64-bit
 **      integer types (i.e., if HAVE_LONG_LONG is defined, which is true
 **      for all the supported compilers topday). If PRInt64 and PRUint64
 **      are defined as structs, the LL_INIT macro defined in prlong.h has
 **      to be used.
+**
+** MACROS:      PR_INT64_MAX
+**              PR_INT64_MIN
+**              PR_UINT64_MAX
+** DESCRIPTION:
+**  The maximum and minimum values of a PRInt64 or PRUint64.
 ************************************************************************/
 #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.
  */
@@ -373,18 +379,17 @@ typedef unsigned __int64 PRUint64;
 #define PR_INT64(x)  x ## i64
 #define PR_UINT64(x) x ## ui64
 #else
 typedef long long PRInt64;
 typedef unsigned long long PRUint64;
 #define PR_INT64(x)  x ## LL
 #define PR_UINT64(x) x ## ULL
 #endif /* PR_BYTES_PER_LONG == 8 */
-/* In any case, we want to define our constants, because PR_INT64 */
-/* and PR_UINT64 will now be defined. */
+
 #define PR_INT64_MAX PR_INT64(0x7fffffffffffffff)
 #define PR_INT64_MIN (-PR_INT64_MAX - 1)
 #define PR_UINT64_MAX PR_UINT64(-1)
 #else  /* !HAVE_LONG_LONG */
 typedef struct {
 #ifdef IS_LITTLE_ENDIAN
     PRUint32 lo, hi;
 #else
--- a/nsprpub/pr/tests/sprintf.c
+++ b/nsprpub/pr/tests/sprintf.c
@@ -291,17 +291,28 @@ static void TestLL(void)
 	LL_INIT(0xffffffff, 0xffffffff),  /* -1 */
 	LL_INIT(0, 10),
 	LL_INIT(0xffffffff, 0xfffffff6),  /* -10 */
 	LL_INIT(0, 32767),
 	LL_INIT(0xffffffff, 0xffff8000),  /* -32768 */
 	LL_INIT(0, 0x7fffffff),  /* 2147483647 */
 	LL_INIT(0xffffffff, 0x80000000),  /* -2147483648 */
 	LL_INIT(0x7fffffff, 0xffffffff),  /* 9223372036854775807 */
-	LL_INIT(0x80000000, 0)            /* -9223372036854775808 */
+	LL_INIT(0x80000000, 0),           /* -9223372036854775808 */
+	PR_INT64(0),
+	PR_INT64(1),
+	PR_INT64(-1),
+	PR_INT64(10),
+	PR_INT64(-10),
+	PR_INT64(32767),
+	PR_INT64(-32768),
+	PR_INT64(2147483647),
+	PR_INT64(-2147483648),
+	PR_INT64(9223372036854775807),
+	PR_INT64(-9223372036854775808)
     };
 
     static char *signs[] = {
 	"",
 	"0",	"-",	"+", " ",
 	"0-",	"0+",	"0 ",	"-0",	"-+",	"- ",
 	"+0",	"+-",	"+ ",	" 0",	" -",	" +",
 	"0-+",	"0- ",	"0+-",	"0+ ",	"0 -",	"0 +",