CVS update: php3

Date: Sunday June 27, 1999 @ 22:51 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv11256 Modified Files: php.h Log Message: work around REGEX include problems Index: php3/php.h diff -u php3/php.h:1.54 php3/php.h:1.55 --- php3/php.h:1.54 Mon Jun 21 20:26:37 1999 +++ php3/php.h Sun Jun 27 22:51:18 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.54 1999/06/22 00:26:37 jim Exp $ */ +/* $Id: php.h,v 1.55 1999/06/28 02:51:18 sas Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -159,12 +159,21 @@ #if REGEX #include "regex/regex.h" +#else +#include <regex.h> +#endif + +#ifndef _REGEX_H #define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ +#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 */ -#else -#include <regex.h> #endif #if STDC_HEADERS