diff options
| author | Anatol Belski <ab@php.net> | 2013-03-03 19:06:22 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-03 19:06:22 +0100 |
| commit | 357ab3cbada57374075ccf57c9ec25bbbbcb6948 (patch) | |
| tree | f8c61f2068629b070bf82ada4ad2b2adc44516ba /ext/pcre/pcrelib/pcre_xclass.c | |
| parent | c134f2a1a5ef56da72dbdc1096eddc91e4f5939e (diff) | |
| download | php-git-357ab3cbada57374075ccf57c9ec25bbbbcb6948.tar.gz | |
merged PCRE 8.32
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
Diffstat (limited to 'ext/pcre/pcrelib/pcre_xclass.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcre_xclass.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/pcre/pcrelib/pcre_xclass.c b/ext/pcre/pcrelib/pcre_xclass.c index 446f85db53..fa73cd8c9d 100644 --- a/ext/pcre/pcrelib/pcre_xclass.c +++ b/ext/pcre/pcrelib/pcre_xclass.c @@ -42,7 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. class. It is used by both pcre_exec() and pcre_def_exec(). */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include "pcre_internal.h" @@ -62,9 +64,9 @@ Returns: TRUE if character matches, else FALSE */ BOOL -PRIV(xclass)(int c, const pcre_uchar *data, BOOL utf) +PRIV(xclass)(pcre_uint32 c, const pcre_uchar *data, BOOL utf) { -int t; +pcre_uchar t; BOOL negated = (*data & XCL_NOT) != 0; (void)utf; @@ -92,7 +94,7 @@ if ((*data++ & XCL_MAP) != 0) data += 32 / sizeof(pcre_uchar); while ((t = *data++) != XCL_END) { - int x, y; + pcre_uint32 x, y; if (t == XCL_SINGLE) { #ifdef SUPPORT_UTF |