diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-30 18:24:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-30 18:24:48 +0200 |
| commit | e2a407c2fe788e685055e81d672c8cc6cd7ceaa5 (patch) | |
| tree | eff567b3b57d2ec369e6a8f8615d754a2655cac0 /ext/pcre/pcre2lib/pcre2_config.c | |
| parent | af4ff75c989374d2f850ae397d62d5a537532c40 (diff) | |
| download | php-git-e2a407c2fe788e685055e81d672c8cc6cd7ceaa5.tar.gz | |
Revert "Update to PCRE2 10.35"
This reverts commit b419f96c626d1f9cbbba42698e947e32a0af9c4f.
This breaks the GCC build with -fcf-protection (default on Ubuntu
at least).
Diffstat (limited to 'ext/pcre/pcre2lib/pcre2_config.c')
| -rw-r--r-- | ext/pcre/pcre2lib/pcre2_config.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ext/pcre/pcre2lib/pcre2_config.c b/ext/pcre/pcre2lib/pcre2_config.c index 5ef103caf7..e487b10220 100644 --- a/ext/pcre/pcre2lib/pcre2_config.c +++ b/ext/pcre/pcre2lib/pcre2_config.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2020 University of Cambridge + New API code Copyright (c) 2016-2017 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -43,8 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. #endif /* Save the configured link size, which is in bytes. In 16-bit and 32-bit modes -its value gets changed by pcre2_intmodedep.h (included by pcre2_internal.h) to -be in code units. */ +its value gets changed by pcre2_internal.h to be in code units. */ static int configured_link_size = LINK_SIZE; @@ -95,7 +94,6 @@ if (where == NULL) /* Requests a length */ case PCRE2_CONFIG_NEWLINE: case PCRE2_CONFIG_PARENSLIMIT: case PCRE2_CONFIG_STACKRECURSE: /* Obsolete */ - case PCRE2_CONFIG_TABLES_LENGTH: case PCRE2_CONFIG_UNICODE: return sizeof(uint32_t); @@ -193,10 +191,6 @@ switch (what) *((uint32_t *)where) = 0; break; - case PCRE2_CONFIG_TABLES_LENGTH: - *((uint32_t *)where) = TABLES_LENGTH; - break; - case PCRE2_CONFIG_UNICODE_VERSION: { #if defined SUPPORT_UNICODE |