Mercurial > hg > nginx
diff src/core/ngx_regex.h @ 4711:7cb78d9289b8 stable-1.2
Merge of r4639, r4640: C++ fixes.
Fixed the ngx_regex.h header file compatibility with C++. Fixed
building --with-cpp_test_module on some systems.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 29 Jun 2012 17:32:43 +0000 |
parents | d620f497c50f |
children | 0b5f12d5c531 |
line wrap: on
line diff
--- a/src/core/ngx_regex.h +++ b/src/core/ngx_regex.h @@ -21,7 +21,7 @@ typedef struct { - pcre *pcre; + pcre *code; pcre_extra *extra; } ngx_regex_t; @@ -50,7 +50,7 @@ void ngx_regex_init(void); ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc); #define ngx_regex_exec(re, s, captures, size) \ - pcre_exec(re->pcre, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \ + pcre_exec(re->code, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \ captures, size) #define ngx_regex_exec_n "pcre_exec()"