From cf0868fec89a1fcac53ff8421f9cf0d9345310c5 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sat, 30 Oct 1999 14:22:10 +0000 Subject: Clean up regex header file mess. php.h now explicitly includes php_regex.h and php_regex.h figures out which regex header files to include and defines symbols that prevents other stuff from including the wrong versions of regex header files. --- ext/ereg/php_regex.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ext/ereg/php_regex.h') diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h index ff7b5cfcb1..427604b417 100644 --- a/ext/ereg/php_regex.h +++ b/ext/ereg/php_regex.h @@ -3,11 +3,21 @@ #if REGEX #include "regex/regex.h" +#ifndef REGEX_H #define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ +#endif +#ifndef REGEX_H_ #define _REGEX_H_ 1 +#endif +#ifndef RX_H #define _RX_H 1 /* Try defining these for Linux to */ +#endif +#ifndef REGEXP_LIBRARY_H #define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */ +#endif +#ifndef H_REGEX #define _H_REGEX 1 /* This one is for AIX */ +#endif #else #include #endif -- cgit v1.2.1