diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-29 17:32:43 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-29 17:32:43 +0000 |
| commit | 917e4ab3fb3759e3c9436256d35a1d6cf6169619 (patch) | |
| tree | c9846301db77dfe8120a4a2a890b9b43496eeb79 | |
| parent | 71b7e2294a68c802930b239e2ed2eda895206846 (diff) | |
| download | nginx-917e4ab3fb3759e3c9436256d35a1d6cf6169619.tar.gz nginx-917e4ab3fb3759e3c9436256d35a1d6cf6169619.tar.bz2 | |
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.
| -rw-r--r-- | auto/modules | 1 | ||||
| -rw-r--r-- | src/core/ngx_regex.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_regex.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/auto/modules b/auto/modules index dab660f87..7d3216b0f 100644 --- a/auto/modules +++ b/auto/modules @@ -458,6 +458,7 @@ fi if [ $NGX_CPP_TEST = YES ]; then NGX_MISC_SRCS="$NGX_MISC_SRCS $NGX_CPP_TEST_SRCS" + CORE_LIBS="$CORE_LIBS -lstdc++" fi diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c index 677f862bf..3771aab8e 100644 --- a/src/core/ngx_regex.c +++ b/src/core/ngx_regex.c @@ -152,7 +152,7 @@ ngx_regex_compile(ngx_regex_compile_t *rc) return NGX_ERROR; } - rc->regex->pcre = re; + rc->regex->code = re; /* do not study at runtime */ @@ -367,7 +367,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle) i = 0; } - elts[i].regex->extra = pcre_study(elts[i].regex->pcre, opt, &errstr); + elts[i].regex->extra = pcre_study(elts[i].regex->code, opt, &errstr); if (errstr != NULL) { ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, @@ -380,7 +380,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle) int jit, n; jit = 0; - n = pcre_fullinfo(elts[i].regex->pcre, elts[i].regex->extra, + n = pcre_fullinfo(elts[i].regex->code, elts[i].regex->extra, PCRE_INFO_JIT, &jit); if (n != 0 || jit != 1) { diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h index 55bd331bb..680486c81 100644 --- 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()" |