diff options
| author | rcritten <> | 2006-01-04 22:07:58 +0000 |
|---|---|---|
| committer | rcritten <> | 2006-01-04 22:07:58 +0000 |
| commit | 6286793e32535b2db1bc82398257a953ee36936f (patch) | |
| tree | 8b36bd4acda9f174fbbade65fc582dbbcf249d56 /nss_expr_parse.y | |
| parent | d4cb1bb2095b03b502e2fd70f3c05d87ea01f9a2 (diff) | |
Changes to allow the mod_nss to work in Apache 2.2.0. Based on a patch
from Oden Eriksson.
The conditional to determine which API to use is a bit weak at the moment
but it works with Apache 2.0.54 and 2.2.0.
Diffstat (limited to 'nss_expr_parse.y')
| -rw-r--r-- | nss_expr_parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nss_expr_parse.y b/nss_expr_parse.y index 9ee1a1a..0eb640f 100644 --- a/nss_expr_parse.y +++ b/nss_expr_parse.y @@ -100,18 +100,18 @@ word : T_DIGIT { $$ = nss_expr_make(op_Digit, $1, NUL ; regex : T_REGEX { - regex_t *regex; + ap_regex_t *regex; if ((regex = ap_pregcomp(nss_expr_info.pool, $1, - REG_EXTENDED|REG_NOSUB)) == NULL) { + AP_REG_EXTENDED|AP_REG_NOSUB)) == NULL) { nss_expr_error = "Failed to compile regular expression"; YYERROR; } $$ = nss_expr_make(op_Regex, regex, NULL); } | T_REGEX_I { - regex_t *regex; + ap_regex_t *regex; if ((regex = ap_pregcomp(nss_expr_info.pool, $1, - REG_EXTENDED|REG_NOSUB|REG_ICASE)) == NULL) { + AP_REG_EXTENDED|AP_REG_NOSUB|AP_REG_ICASE)) == NULL) { nss_expr_error = "Failed to compile regular expression"; YYERROR; } |