cvs: /php4 php_regex.h /php4/regex regex_extra.h

sas Sat Nov 13 13:33:58 1999 EDT Modified files: /php4 php_regex.h /php4/regex regex_extra.h Log: Suck in prototypes correctly with applied aliases (otherwise php_reg* would not be prototyped) Index: php4/php_regex.h diff -u php4/php_regex.h:1.7 php4/php_regex.h:1.8 --- php4/php_regex.h:1.7 Sat Nov 13 11:51:30 1999 +++ php4/php_regex.h Sat Nov 13 13:33:27 1999 @@ -2,7 +2,15 @@ #define _PHP_REGEX_H #if REGEX == 1 +/* get aliases */ +#include "regex/regex_extra.h" #include "regex/regex.h" + +/* get rid of aliases */ +#define PHP_NO_ALIASES +#include "regex/regex_extra.h" +#undef PHP_NO_ALIASES + #ifndef _REGEX_H #define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ #endif Index: php4/regex/regex_extra.h diff -u php4/regex/regex_extra.h:1.2 php4/regex/regex_extra.h:1.3 --- php4/regex/regex_extra.h:1.2 Sat Nov 13 13:03:07 1999 +++ php4/regex/regex_extra.h Sat Nov 13 13:33:28 1999 @@ -1,3 +1,4 @@ +/* do not frame this - we must be able to include this file multiple times */ #undef regexec #undef regerror @@ -8,10 +9,14 @@ #if !(WIN32|WINNT) +#ifndef PHP_NO_ALIASES + #define regexec php_regexec #define regerror php_regerror #define regfree php_regfree #define regcomp php_regcomp + +#endif #endif