From: Sascha Schumann <sas@php.net>
Date: Tue, 30 Nov 1999 23:19:33 +0000 (+0000)
Subject: Avoid Apache's regex.h, if system regex was chosen
X-Git-Tag: PRE_RETURN_REF_PATCH~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00f8f24d74c3eda8e29800d7c6d3bb908897cd3c;p=php

Avoid Apache's regex.h, if system regex was chosen
---

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 62279c4c08..be0f445af7 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 <regex.h>
+#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 62279c4c08..be0f445af7 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 <regex.h>
+#ifndef _REGEX_H_
+#define _REGEX_H_ 1
+#endif
 #endif
 
 #endif /* _PHP_REGEX_H */