Kill the regex header file warnings

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 9ed80d84b84a5d89a0c37691311e433cf9c46e59..ff7b5cfcb1cacc326ee15c52d27d6f92dd0c5b83 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -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 */

diff --git a/ext/ereg/regex/regex.h b/ext/ereg/regex/regex.h
index 28638e44c900ff896554399281e955550d8aed60..985ad029592716d46ef804f2c514b4a2545f9687 100644 (file)
--- a/ext/ereg/regex/regex.h
+++ b/ext/ereg/regex/regex.h
@@ -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" {

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 4fe4c38687ac34fe0971dc1731a8e0eb5dffcf58..e3429958556c94c2206a724c9874ca03a6257e2c 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -123,7 +123,7 @@ void php_dl(pval *file,int type,pval *return_value)
        
        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();

diff --git a/main/php_regex.h b/main/php_regex.h
index 9ed80d84b84a5d89a0c37691311e433cf9c46e59..ff7b5cfcb1cacc326ee15c52d27d6f92dd0c5b83 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -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 */

diff --git a/regex/regex.h b/regex/regex.h
index 28638e44c900ff896554399281e955550d8aed60..985ad029592716d46ef804f2c514b4a2545f9687 100644 (file)
--- a/regex/regex.h
+++ b/regex/regex.h
@@ -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" {