merged PCRE 8.32

- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt

1 files changed, 8 insertions, 3 deletions

diff --git a/ext/pcre/pcrelib/pcre_maketables.c b/ext/pcre/pcrelib/pcre_maketables.c
index 5c73b75f74..610a669586 100644
--- a/ext/pcre/pcrelib/pcre_maketables.c
+++ b/ext/pcre/pcrelib/pcre_maketables.c
@@ -45,7 +45,9 @@ compilation of dftables.c, in which case the macro DFTABLES is defined. */
 
 
 #ifndef DFTABLES
+#  ifdef HAVE_CONFIG_H
 #  include "config.h"
+#  endif
 #  include "pcre_internal.h"
 #endif
 
@@ -64,12 +66,15 @@ Arguments:   none
 Returns:     pointer to the contiguous block of data
 */
 
-#ifdef COMPILE_PCRE8
+#if defined COMPILE_PCRE8
 const unsigned char *
 pcre_maketables(void)
-#else
+#elif defined COMPILE_PCRE16
 const unsigned char *
 pcre16_maketables(void)
+#elif defined COMPILE_PCRE32
+const unsigned char *
+pcre32_maketables(void)
 #endif
 {
 unsigned char *yield, *p;
@@ -125,7 +130,7 @@ within regexes. */
 for (i = 0; i < 256; i++)
   {
   int x = 0;
-  if (i != 0x0b && isspace(i)) x += ctype_space;
+  if (i != CHAR_VT && isspace(i)) x += ctype_space;
   if (isalpha(i)) x += ctype_letter;
   if (isdigit(i)) x += ctype_digit;
   if (isxdigit(i)) x += ctype_xdigit;