diff options
| author | zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-01-05 19:18:12 +0000 |
|---|---|---|
| committer | zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-01-05 19:18:12 +0000 |
| commit | abe09755a8ae5d60c229d36b442aebb4961537b7 (patch) | |
| tree | b15d419dc471fd15a92eb1f42df5980032f37461 /pcre_dfa_exec.c | |
| parent | 1f316699980bbdf66470a8edd1ab47c1df1a9c1a (diff) | |
| download | pcre-abe09755a8ae5d60c229d36b442aebb4961537b7.tar.gz | |
Add pcre16 prefix to 16 bit structs
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@852 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'pcre_dfa_exec.c')
| -rw-r--r-- | pcre_dfa_exec.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pcre_dfa_exec.c b/pcre_dfa_exec.c index ba9b416..887c79b 100644 --- a/pcre_dfa_exec.c +++ b/pcre_dfa_exec.c @@ -2557,7 +2557,11 @@ for (;;) cb.version = 1; /* Version 1 of the callout block */ cb.callout_number = code[LINK_SIZE+2]; cb.offset_vector = offsets; +#ifdef COMPILE_PCRE8 cb.subject = (PCRE_SPTR)start_subject; +#else + cb.subject = (PCRE_SPTR16)start_subject; +#endif cb.subject_length = (int)(end_subject - start_subject); cb.start_match = (int)(current_subject - start_subject); cb.current_position = (int)(ptr - start_subject); @@ -2896,7 +2900,11 @@ for (;;) cb.version = 1; /* Version 1 of the callout block */ cb.callout_number = code[1]; cb.offset_vector = offsets; +#ifdef COMPILE_PCRE8 cb.subject = (PCRE_SPTR)start_subject; +#else + cb.subject = (PCRE_SPTR16)start_subject; +#endif cb.subject_length = (int)(end_subject - start_subject); cb.start_match = (int)(current_subject - start_subject); cb.current_position = (int)(ptr - start_subject); @@ -3013,12 +3021,12 @@ pcre_dfa_exec(const pcre *argument_re, const pcre_extra *extra_data, int offsetcount, int *workspace, int wscount) #else PCRE_EXP_DEFN int PCRE_CALL_CONVENTION -pcre16_dfa_exec(const pcre *argument_re, const pcre16_extra *extra_data, +pcre16_dfa_exec(const pcre16 *argument_re, const pcre16_extra *extra_data, PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets, int offsetcount, int *workspace, int wscount) #endif { -real_pcre *re = (real_pcre *)argument_re; +REAL_PCRE *re = (REAL_PCRE *)argument_re; dfa_match_data match_block; dfa_match_data *md = &match_block; BOOL utf, anchored, startline, firstline; |