From cfffe44f4160f9054ccdda259fd2156bc334f381 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 10 May 2017 17:36:58 +0200
Subject: [PATCH] Bug 1350291, uplift NSPR_4_15_BETA2, r=franziskus

---
 nsprpub/TAG-INFO             | 2 +-
 nsprpub/config/prdepend.h    | 1 +
 nsprpub/pr/include/prtypes.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index d9e72d054c1a..366912a76ffd 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_15_BETA1
+NSPR_4_15_BETA2
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index e49e92677e3e..6c66b37ca0fc 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/pr/include/prtypes.h b/nsprpub/pr/include/prtypes.h
index 52b3ab0b198a..ca140c702139 100644
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -231,7 +231,7 @@ PR_BEGIN_EXTERN_C
 ** 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