diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-03 08:56:55 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-03 12:55:47 +0000 |
| commit | 76efe79d5cafcda16a986e26f5f6ef973c94b325 (patch) | |
| tree | 687ce134a2b8142f1617f664d85e2ea479720174 /src/3rdparty/pcre2/src/pcre2_intmodedep.h | |
| parent | 42d865e08c68146f2565679b3cf75d75bdee9d35 (diff) | |
| parent | b5c2535eb0da4ad2b65e79df288a3674f3118717 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_intmodedep.h')
| -rw-r--r-- | src/3rdparty/pcre2/src/pcre2_intmodedep.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_intmodedep.h b/src/3rdparty/pcre2/src/pcre2_intmodedep.h index 62626d0a8a..bf3a235984 100644 --- a/src/3rdparty/pcre2/src/pcre2_intmodedep.h +++ b/src/3rdparty/pcre2/src/pcre2_intmodedep.h @@ -585,6 +585,8 @@ typedef struct pcre2_real_match_context { #endif int (*callout)(pcre2_callout_block *, void *); void *callout_data; + int (*substitute_callout)(pcre2_substitute_callout_block *, void *); + void *substitute_callout_data; PCRE2_SIZE offset_limit; uint32_t heap_limit; uint32_t match_limit; @@ -656,7 +658,8 @@ typedef struct pcre2_real_match_data { PCRE2_SIZE leftchar; /* Offset to leftmost code unit */ PCRE2_SIZE rightchar; /* Offset to rightmost code unit */ PCRE2_SIZE startchar; /* Offset to starting code unit */ - uint16_t matchedby; /* Type of match (normal, JIT, DFA) */ + uint8_t matchedby; /* Type of match (normal, JIT, DFA) */ + uint8_t flags; /* Various flags */ uint16_t oveccount; /* Number of pairs */ int rc; /* The return code from the match */ PCRE2_SIZE ovector[131072]; /* Must be last in the structure */ |