cvs: /php4 php_regex.h
| From: | Sascha Schumann | Date: | Tue, 30 Nov 1999 23:20:04 +0000 |
| Subject: | cvs: /php4 php_regex.h | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7135@lists.php.net to get a copy of this message | ||
sas Tue Nov 30 18:20:04 1999 EDT
Modified files:
/php4 php_regex.h
Log:
Avoid Apache's regex.h, if system regex was chosen
Index: php4/php_regex.h
diff -u php4/php_regex.h:1.8 php4/php_regex.h:1.9
--- php4/php_regex.h:1.8 Sat Nov 13 13:33:27 1999
+++ php4/php_regex.h Tue Nov 30 18:19:33 1999
@@ -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 */