cvs: /php4 php_regex.h /php4/ext/standard dl.c /php4/regex regex.h

rasmus Fri Oct 29 13:33:21 1999 EDT Modified files: /php4 php_regex.h /php4/ext/standard dl.c /php4/regex regex.h Log: Kill the regex header file warnings Index: php4/php_regex.h diff -u php4/php_regex.h:1.2 php4/php_regex.h:1.3 --- php4/php_regex.h:1.2 Tue Aug 3 11:27:19 1999 +++ php4/php_regex.h Fri Oct 29 13:33:18 1999 @@ -4,6 +4,7 @@ #if REGEX #include "regex/regex.h" #define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ +#define _REGEX_H_ 1 #define _RX_H 1 /* Try defining these for Linux to */ #define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */ #define _H_REGEX 1 /* This one is for AIX */ Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.13 php4/ext/standard/dl.c:1.14 --- php4/ext/standard/dl.c:1.13 Sun Oct 17 04:07:50 1999 +++ php4/ext/standard/dl.c Fri Oct 29 13:33:19 1999 @@ -123,7 +123,7 @@ if (!get_module) { dlclose(handle); - php_error(E_CORE_WARNING,"Invalid library (maybe not a PHP3 library) '%s' ",file->value.str.val); + php_error(E_CORE_WARNING,"Invalid library (maybe not a PHP library) '%s' ",file->value.str.val); RETURN_FALSE; } module_entry = get_module(); Index: php4/regex/regex.h diff -u php4/regex/regex.h:1.4 php4/regex/regex.h:1.5 --- php4/regex/regex.h:1.4 Tue Oct 5 07:00:48 1999 +++ php4/regex/regex.h Fri Oct 29 13:33:19 1999 @@ -1,7 +1,7 @@ -#ifndef _REGEX_H_ -#define _REGEX_H_ -#ifndef _REGEX_H -#define _REGEX_H /* never again */ +#ifndef _HSREGEX_H_ +#define _HSREGEX_H_ +#ifndef _HSREGEX_H +#define _HSREGEX_H /* never again */ /* ========= begin header generated by ././mkh ========= */ #ifdef __cplusplus extern "C" {