summaryrefslogtreecommitdiff
path: root/ext/ereg/php_regex.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/ereg/php_regex.h')
-rw-r--r--ext/ereg/php_regex.h11
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