Bug 713936, land NSPR_4_9_BETA7 for final release testing, r=wtc
authorKai Engert <kaie@kuix.de>
Tue, 14 Feb 2012 23:06:50 +0100
changeset 86816 1a7ced340f9bd9f736d93017e1a9f7d256f24497
parent 86815 21783313b2e1a65dbd0017f62c4dcf7c41cb3852
child 86817 e5df0f4321adc4246d0e575b34c36b4c7826d7dd
push idunknown
push userunknown
push dateunknown
reviewerswtc
bugs713936
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 713936, land NSPR_4_9_BETA7 for final release testing, r=wtc
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/configure
nsprpub/configure.in
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_BETA7
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -38,8 +38,9 @@
 /*
  * 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/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 +",