Bug 1591887 - Uplift NSPR 4.24 RTM, only version number changes. r=jcj

UPGRADE_NSPR_RELEASE Differential Revision: https://phabricator.services.mozilla.com/D55523
iaxat · Dec 2, 2019 · ec6ea88 · ec6ea88
1 parent 092f7cb
commit ec6ea88
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_24_BETA1
+NSPR_4_24_RTM
diff --git 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/prinit.h b/nsprpub/pr/include/prinit.h
@@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.24 Beta"
+#define PR_VERSION  "4.24"
 #define PR_VMAJOR   4
 #define PR_VMINOR   24
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck

diff --git a/old-configure.in b/old-configure.in
@@ -47,7 +47,7 @@ dnl Set the version number of the libs included with mozilla
 dnl ========================================================
 MOZPNG=10635
 NSPR_VERSION=4
-NSPR_MINVER=4.23
+NSPR_MINVER=4.24
 NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		*/

		#error "Do not include this header file."