Damn, can't see underscores correctly on this silly terminal I am on

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 427604b41787b22043ea61d1c715010ae6300bad..09fdde05fee744c3a20115ddb2ccb0c388655ecc 100644 (file)
--- 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 427604b41787b22043ea61d1c715010ae6300bad..09fdde05fee744c3a20115ddb2ccb0c388655ecc 100644 (file)
--- 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