summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2013-02-10 17:56:12 +0000
committerwtc%google.com <devnull@localhost>2013-02-10 17:56:12 +0000
commitcaaf621d882374bde68044cd1e2800d548a3e042 (patch)
treed556ce35f955f8b0585da0f74af9eff7b186cb53
parent875c95c45bac0b9f625ce48978e4d168a6bbdafe (diff)
downloadnspr-hg-caaf621d882374bde68044cd1e2800d548a3e042.tar.gz
Set NSPR version to 4.9.6 Beta.
Modified Files: configure configure.in pr/include/prinit.h pr/tests/vercheck.c
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
-rw-r--r--pr/include/prinit.h6
-rw-r--r--pr/tests/vercheck.c9
4 files changed, 10 insertions, 9 deletions
diff --git a/configure b/configure
index 5348f5c0..0b29e9d8 100755
--- a/configure
+++ b/configure
@@ -736,7 +736,7 @@ test "$host_alias" != "$target_alias" &&
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=9
-MOD_PATCH_VERSION=5
+MOD_PATCH_VERSION=6
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/configure.in b/configure.in
index 079ed871..64072541 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
MOD_MINOR_VERSION=9
-MOD_PATCH_VERSION=5
+MOD_PATCH_VERSION=6
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
USE_PTHREADS=
diff --git a/pr/include/prinit.h b/pr/include/prinit.h
index bb1ce011..9e5da350 100644
--- a/pr/include/prinit.h
+++ b/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.9.5"
+#define PR_VERSION "4.9.6 Beta"
#define PR_VMAJOR 4
#define PR_VMINOR 9
-#define PR_VPATCH 5
-#define PR_BETA PR_FALSE
+#define PR_VPATCH 6
+#define PR_BETA PR_TRUE
/*
** PRVersionCheck
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index 556278fe..3ba852e0 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -20,9 +20,9 @@
#include <stdlib.h>
/*
- * This release (4.9.5) is backward compatible with the
+ * This release (4.9.6) is backward compatible with the
* 4.0.x, 4.1.x, 4.2.x, 4.3.x, 4.4.x, 4.5.x, 4.6.x, 4.7.x,
- * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, and 4.9.4 releases.
+ * 4.8.x, 4.9, 4.9.1, 4.9.2, 4.9.3, 4.9.4, and 4.9.5 releases.
* It, of course, is compatible with itself.
*/
static char *compatible_version[] = {
@@ -35,7 +35,8 @@ static char *compatible_version[] = {
"4.7.6",
"4.8", "4.8.1", "4.8.2", "4.8.3", "4.8.4", "4.8.5",
"4.8.6", "4.8.7", "4.8.8", "4.8.9",
- "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", PR_VERSION
+ "4.9", "4.9.1", "4.9.2", "4.9.3", "4.9.4", "4.9.5",
+ PR_VERSION
};
/*
@@ -50,7 +51,7 @@ static char *incompatible_version[] = {
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
- "4.9.6",
+ "4.9.7",
"4.10", "4.10.1",
"10.0", "11.1", "12.14.20"
};