From 0b95c6bfca0334f5aeebaa713665523c7693d004 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Mon, 5 Mar 2018 17:05:18 +0100 Subject: [PATCH] Bug 1432480, land NSPR_4_19_RTM, no code changes, only version numbers. Require version 4.19 for building. r=me UPGRADE_NSPR_RELEASE DONTBUILD --- nsprpub/TAG-INFO | 2 +- nsprpub/config/prdepend.h | 1 + nsprpub/pr/include/prinit.h | 4 ++-- old-configure.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO index 76d4726ca5c69..ed713edea78e9 100644 --- a/nsprpub/TAG-INFO +++ b/nsprpub/TAG-INFO @@ -1 +1 @@ -NSPR_4_19_BETA1 +NSPR_4_19_RTM diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h index e49e92677e3eb..6c66b37ca0fc7 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/prinit.h b/nsprpub/pr/include/prinit.h index d1878438ca2c3..ab3aba2082c2b 100644 --- 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 ** ".[.] []" */ -#define PR_VERSION "4.19 Beta" +#define PR_VERSION "4.19" #define PR_VMAJOR 4 #define PR_VMINOR 19 #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 index 63134234f8227..aa3eaac54fe02 100644 --- a/old-configure.in +++ b/old-configure.in @@ -48,7 +48,7 @@ dnl ======================================================== MOZJPEG=62 MOZPNG=10634 NSPR_VERSION=4 -NSPR_MINVER=4.18 +NSPR_MINVER=4.19 NSS_VERSION=3 dnl Set the minimum version of toolkit libs used by mozilla