summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/ereg/php_regex.h10
-rw-r--r--main/php_regex.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 427604b417..09fdde05fe 100644
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -3,19 +3,19 @@
#if REGEX
#include "regex/regex.h"
-#ifndef 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_
+#ifndef _REGEX_H_
#define _REGEX_H_ 1
#endif
-#ifndef RX_H
+#ifndef _RX_H
#define _RX_H 1 /* Try defining these for Linux to */
#endif
-#ifndef REGEXP_LIBRARY_H
+#ifndef __REGEXP_LIBRARY___H
#define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */
#endif
-#ifndef H_REGEX
+#ifndef _H_REGEX
#define _H_REGEX 1 /* This one is for AIX */
#endif
#else
diff --git a/main/php_regex.h b/main/php_regex.h
index 427604b417..09fdde05fe 100644
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -3,19 +3,19 @@
#if REGEX
#include "regex/regex.h"
-#ifndef 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_
+#ifndef _REGEX_H_
#define _REGEX_H_ 1
#endif
-#ifndef RX_H
+#ifndef _RX_H
#define _RX_H 1 /* Try defining these for Linux to */
#endif
-#ifndef REGEXP_LIBRARY_H
+#ifndef __REGEXP_LIBRARY___H
#define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */
#endif
-#ifndef H_REGEX
+#ifndef _H_REGEX
#define _H_REGEX 1 /* This one is for AIX */
#endif
#else