summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-20 19:12:46 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2008-01-20 19:12:46 +0000
commit8a8115165a130693f7cf711bbdc52e1e30a8834f (patch)
treef23a740d8b5da3a021462ce35386b68c06478282
parenta86678eb9765f4ed56c7d7224ef20601bbf47a37 (diff)
downloadpcre-8a8115165a130693f7cf711bbdc52e1e30a8834f.tar.gz
Exclude "long long" test in pcrecpp_unittest when HAVE_LONG_LONG is not
defined. git-svn-id: svn://vcs.exim.org/pcre/code/trunk@302 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac4
-rw-r--r--pcrecpp_unittest.cc2
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 44a9abc..441708d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,15 @@
ChangeLog for PCRE
------------------
-Version 7.6 14-Jan-08
+Version 7.6 19-Jan-08
---------------------
-1. A class with a very large number of characters with codepoints greater
- than 255 (in UTF-8 mode, of course), caused a buffer overflow.
+1. A character class containing a very large number of characters with
+ codepoints greater than 255 (in UTF-8 mode, of course) caused a buffer
+ overflow.
+
+2. Patch to cut out the "long long" test in pcrecpp_unittest when
+ HAVE_LONG_LONG is not defined.
Version 7.5 10-Jan-08
diff --git a/configure.ac b/configure.ac
index f4d1b7e..cfe7397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ dnl empty.
m4_define(pcre_major, [7])
m4_define(pcre_minor, [6])
-m4_define(pcre_prerelease, [])
-m4_define(pcre_date, [2008-01-14])
+m4_define(pcre_prerelease, [-RC1])
+m4_define(pcre_date, [2008-01-19])
# Libtool shared library interface versions (current:revision:age)
m4_define(libpcre_version, [0:1:0])
diff --git a/pcrecpp_unittest.cc b/pcrecpp_unittest.cc
index 4f49cb2..2e5f2df 100644
--- a/pcrecpp_unittest.cc
+++ b/pcrecpp_unittest.cc
@@ -879,7 +879,9 @@ int main(int argc, char** argv) {
CHECK(RE("h(.*)o").FullMatch("hello", (string*)NULL));
CHECK(RE("h(.*)o").FullMatch("hello", (StringPiece*)NULL));
CHECK(RE("(.*)").FullMatch("1234", (int*)NULL));
+#ifdef HAVE_LONG_LONG
CHECK(RE("(.*)").FullMatch("1234567890123456", (long long*)NULL));
+#endif
CHECK(RE("(.*)").FullMatch("123.4567890123456", (double*)NULL));
CHECK(RE("(.*)").FullMatch("123.4567890123456", (float*)NULL));