summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2019-11-21 16:31:08 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2019-11-21 16:31:08 +0000
commit4c619d4d01386c5b2f90bc659f9ea0821b665644 (patch)
tree62f7dab1643aa99cf21b541c2ee378281f12f2fa
parent3255e7c4bb6f7317e9e119718b254a13567909ba (diff)
downloadpcre2-4c619d4d01386c5b2f90bc659f9ea0821b665644.tar.gz
Final file tidies for 10.34
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1188 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--configure.ac4
-rw-r--r--src/config.h.generic6
-rw-r--r--src/pcre2.h.generic4
-rw-r--r--src/pcre2_compile.c4
-rw-r--r--src/pcre2test.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index f3e3ba2..0926c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@ Change Log for PCRE2
--------------------
-Version 10.34-RC1 06-November-2019
-----------------------------------
+Version 10.34 21-November-2019
+------------------------------
1. The maximum number of capturing subpatterns is 65535 (documented), but no
check on this was ever implemented. This omission has been rectified; it fixes
diff --git a/NEWS b/NEWS
index 58794b5..30075d0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ News about PCRE2 releases
-------------------------
-Version 10.34 06-November-2019
+Version 10.34 21-November-2019
------------------------------
Another release with a few enhancements as well as bugfixes and tidies. The
diff --git a/configure.ac b/configure.ac
index 0d1bea3..30d4ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre2_major, [10])
m4_define(pcre2_minor, [34])
-m4_define(pcre2_prerelease, [-RC2])
-m4_define(pcre2_date, [2019-11-06])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2019-11-21])
# NOTE: The CMakeLists.txt file searches for the above variables in the first
# 50 lines of this file. Please update that if the variables above are moved.
diff --git a/src/config.h.generic b/src/config.h.generic
index 57b4abf..787bb9c 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -218,7 +218,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_NAME "PCRE2"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.34-RC2"
+#define PACKAGE_STRING "PCRE2 10.34"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2"
@@ -227,7 +227,7 @@ sure both macros are undefined; an emulation function will then be used. */
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "10.34-RC2"
+#define PACKAGE_VERSION "10.34"
/* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
parentheses (of any kind) in a pattern. This limits the amount of system
@@ -352,7 +352,7 @@ sure both macros are undefined; an emulation function will then be used. */
#endif
/* Version number of package */
-#define VERSION "10.34-RC2"
+#define VERSION "10.34"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index 7f000b5..cb9d61a 100644
--- a/src/pcre2.h.generic
+++ b/src/pcre2.h.generic
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 34
-#define PCRE2_PRERELEASE -RC2
-#define PCRE2_DATE 2019-11-06
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2019-11-21
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE2, the appropriate
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index 800b61b..f2e6b6b 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -8743,9 +8743,9 @@ do {
if (inassert == 0) return 0;
/* If the character is more than one code unit long, we cannot set its
- first code unit when matching caselessly. Later scanning may pick up
+ first code unit when matching caselessly. Later scanning may pick up
multiple code units. */
-
+
#ifdef SUPPORT_UNICODE
#if PCRE2_CODE_UNIT_WIDTH == 8
if (scode[1] >= 0x80) return 0;
diff --git a/src/pcre2test.c b/src/pcre2test.c
index cdf88c1..57bd110 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -170,8 +170,8 @@ commented out the original, but kept it around just in case. */
#endif
/* VC and older compilers don't support %td or %zu, and even some that claim to
-be C99 don't support it (hence DISABLE_PERCENT_ZT). There are some non-C99
-environments where %lu gives a warning with 32-bit pointers. As there doesn't
+be C99 don't support it (hence DISABLE_PERCENT_ZT). There are some non-C99
+environments where %lu gives a warning with 32-bit pointers. As there doesn't
seem to be an easy way round this, just live with it (the cases are rare). */
#if defined(_MSC_VER) || !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L || defined(DISABLE_PERCENT_ZT)