Revision: 971
http://vcs.pcre.org/viewvc?view=rev&revision=971
Author: ph10
Date: 2012-06-01 17:29:43 +0100 (Fri, 01 Jun 2012)
Log Message:
-----------
Fix pcregrep build problem when bzip2 but not gzip was enabled.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/pcregrep.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2012-05-27 05:28:19 UTC (rev 970)
+++ code/trunk/ChangeLog 2012-06-01 16:29:43 UTC (rev 971)
@@ -120,7 +120,11 @@
33. Variable renamings in the PCRE-JIT compiler. No functionality change.
+34. Fixed typos in pcregrep: in two places there was SUPPORT_LIBZ2 instead of
+ SUPPORT_LIBBZ2. This caused a build problem when bzip2 but not gzip (zlib)
+ was enabled.
+
Version 8.30 04-February-2012
-----------------------------
Modified: code/trunk/pcregrep.c
===================================================================
--- code/trunk/pcregrep.c 2012-05-27 05:28:19 UTC (rev 970)
+++ code/trunk/pcregrep.c 2012-06-01 16:29:43 UTC (rev 971)
@@ -1618,7 +1618,7 @@
BZFILE *inbz2 = NULL;
#endif
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
int pathlen;
#endif
@@ -1701,7 +1701,7 @@
argument at top level, we don't show the file name, unless we are only showing
the file name, or the filename was forced (-H). */
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
pathlen = (int)(strlen(pathname));
#endif