Bug 1350291, uplift NSPR_4_15_BETA2, r=franziskus
authorKai Engert <kaie@kuix.de>
Wed, 10 May 2017 17:36:58 +0200
changeset 392776 36496a0fbbab4f9fe0765301cec818233831b23a
parent 392775 590b949a5e4ae9239e453a6c63a968faa5e8ca44
child 392777 179023a3c485f01838b7f5446bc2ef9adf89bcfb
push idunknown
push userunknown
push dateunknown
reviewersfranziskus
bugs1350291
milestone55.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 1350291, uplift NSPR_4_15_BETA2, r=franziskus
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/prtypes.h
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_15_BETA1
+NSPR_4_15_BETA2
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,8 +5,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/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -226,17 +226,17 @@ PR_BEGIN_EXTERN_C
 **
 ** NOTE: NSPR can't use <stdint.h> because C99 requires C++ code to define
 ** __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS to make all the macros
 ** defined in <stdint.h> available. This strange requirement is gone in
 ** C11. When most platforms ignore this C99 requirement, NSPR will be able
 ** to use <stdint.h>. A patch to do that is in NSPR bug 634793.
 */
 
-#if defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__)
+#if defined(__APPLE__) || defined(__OpenBSD__)
 #define PR_ALTERNATE_INT64_TYPEDEF
 #endif
 
 /************************************************************************
 ** TYPES:       PRUint8
 **              PRInt8
 ** DESCRIPTION:
 **  The int8 types are known to be 8 bits each. There is no type that