diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-15 19:50:07 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-15 19:50:07 +0000 |
| commit | 41c637584087930656ddb33fa95dc2af8612fceb (patch) | |
| tree | 728e6aa75351fb4ca4eebc2373ed6eea39b51dfd /ext/ereg/php_regex.h | |
| parent | 15ad001163984715eb6115caa3cceb087441d7fb (diff) | |
| download | php-git-41c637584087930656ddb33fa95dc2af8612fceb.tar.gz | |
- Moved the old regex functions to it's own extension: ereg
Diffstat (limited to 'ext/ereg/php_regex.h')
| -rw-r--r-- | ext/ereg/php_regex.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h index 3537d6ab87..3199a662b1 100644 --- a/ext/ereg/php_regex.h +++ b/ext/ereg/php_regex.h @@ -29,12 +29,12 @@ #if REGEX /* get aliases */ -#include "regex/regex_extra.h" -#include "regex/regex.h" +#include "ext/ereg/regex/regex_extra.h" +#include "ext/ereg/regex/regex.h" /* get rid of aliases */ #define PHP_NO_ALIASES -#include "regex/regex_extra.h" +#include "ext/ereg/regex/regex_extra.h" #undef PHP_NO_ALIASES #undef _PCREPOSIX_H @@ -63,3 +63,8 @@ #endif #endif /* PHP_REGEX_H */ + +/* No frame, regex_extra.h must be included always */ +#if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H) +#include "ext/ereg/regex/regex_extra.h" +#endif |