From 00f8f24d74c3eda8e29800d7c6d3bb908897cd3c Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Tue, 30 Nov 1999 23:19:33 +0000 Subject: [PATCH] Avoid Apache's regex.h, if system regex was chosen --- ext/ereg/php_regex.h | 10 ++++++++++ main/php_regex.h | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h index 62279c4c08d..be0f445af70 100644 --- a/ext/ereg/php_regex.h +++ b/ext/ereg/php_regex.h @@ -1,6 +1,13 @@ #ifndef _PHP_REGEX_H #define _PHP_REGEX_H +/* + * REGEX means: + * 0.. system regex + * 1.. bundled regex + * 2.. Apache's regex + */ + #if REGEX == 1 /* get aliases */ #include "regex/regex_extra.h" @@ -28,6 +35,9 @@ #endif #elif REGEX == 0 #include +#ifndef _REGEX_H_ +#define _REGEX_H_ 1 +#endif #endif #endif /* _PHP_REGEX_H */ diff --git a/main/php_regex.h b/main/php_regex.h index 62279c4c08d..be0f445af70 100644 --- a/main/php_regex.h +++ b/main/php_regex.h @@ -1,6 +1,13 @@ #ifndef _PHP_REGEX_H #define _PHP_REGEX_H +/* + * REGEX means: + * 0.. system regex + * 1.. bundled regex + * 2.. Apache's regex + */ + #if REGEX == 1 /* get aliases */ #include "regex/regex_extra.h" @@ -28,6 +35,9 @@ #endif #elif REGEX == 0 #include +#ifndef _REGEX_H_ +#define _REGEX_H_ 1 +#endif #endif #endif /* _PHP_REGEX_H */