From 93614700700bd908ba9212627dfaca23580a234e Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 21 Jan 2017 11:47:30 -0800 Subject: [PATCH] Update Xcode build in response to PCRE2 upgrade Replace the osx/pcre2/config.h with a new config.h from the PCRE2 upgrade Fixes #3755 --- osx/pcre2/config.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/osx/pcre2/config.h b/osx/pcre2/config.h index e76dd9f7c..c663bd26b 100644 --- a/osx/pcre2/config.h +++ b/osx/pcre2/config.h @@ -112,6 +112,9 @@ sure both macros are undefined; an emulation function will then be used. */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 @@ -170,6 +173,9 @@ sure both macros are undefined; an emulation function will then be used. */ overflow caused by enormously large patterns. */ #define MAX_NAME_SIZE 32 +/* Defining NEVER_BACKSLASH_C locks out the use of \C in all patterns. */ +/* #undef NEVER_BACKSLASH_C */ + /* The value of NEWLINE_DEFAULT determines the default newline character sequence. PCRE2 client programs can override this by selecting other values at run time. The valid values are 1 (CR), 2 (LF), 3 (CRLF), 4 (ANY), and 5 @@ -186,7 +192,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.20" +#define PACKAGE_STRING "PCRE2 10.22" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcre2" @@ -195,7 +201,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.20" +#define PACKAGE_VERSION "10.22" /* 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 @@ -234,7 +240,7 @@ sure both macros are undefined; an emulation function will then be used. */ #define PCRE2_EXP_DEFN __attribute__ ((visibility ("default"))) /* Define to any value if linking statically (TODO: make nice with Libtool) */ -#define PCRE2_STATIC 1 +/* #undef PCRE2_STATIC */ /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -260,6 +266,9 @@ sure both macros are undefined; an emulation function will then be used. */ is able to handle .gz files. */ /* #undef SUPPORT_LIBZ */ +/* Define to any value to enable callout script support in pcre2grep. */ +#define SUPPORT_PCRE2GREP_CALLOUT /**/ + /* Define to any value to enable JIT support in pcre2grep. */ /* #undef SUPPORT_PCRE2GREP_JIT */ @@ -267,10 +276,10 @@ sure both macros are undefined; an emulation function will then be used. */ /* #undef SUPPORT_PCRE2_16 */ /* Define to any value to enable the 32 bit PCRE2 library. */ -#define SUPPORT_PCRE2_32 /**/ +/* #undef SUPPORT_PCRE2_32 */ /* Define to any value to enable the 8 bit PCRE2 library. */ -/* #undef SUPPORT_PCRE2_8 */ +#define SUPPORT_PCRE2_8 /**/ /* Define to any value to enable support for Unicode and UTF encoding. This will work even in an EBCDIC environment, but it is incompatible with the @@ -282,7 +291,7 @@ sure both macros are undefined; an emulation function will then be used. */ /* #undef SUPPORT_VALGRIND */ /* Version number of package */ -#define VERSION "10.20" +#define VERSION "10.22" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */