Suck in prototypes correctly with applied aliases

(otherwise php_reg* would not be prototyped)

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index 91cbd994c41ddf195820699239b014c7ba3d5e1f..62279c4c08db29f5622a913a688bbdf1fa01bf9d 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -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

diff --git a/ext/ereg/regex/regex_extra.h b/ext/ereg/regex/regex_extra.h
index 511df57f675b689d0a98ba2036990940e5b8a66b..3db9e4ad1a8e8f53ede63074c38f2f275ac59912 100644 (file)
--- a/ext/ereg/regex/regex_extra.h
+++ b/ext/ereg/regex/regex_extra.h
@@ -1,3 +1,4 @@
+/* do not frame this - we must be able to include this file multiple times */
 
 #undef regexec
 #undef regerror
@@ -8,6 +9,8 @@
 
 #if !(WIN32|WINNT)
 
+#ifndef PHP_NO_ALIASES
+
 #define regexec php_regexec
 #define regerror php_regerror
 #define regfree php_regfree
@@ -16,3 +19,5 @@
 #endif
 
 #endif
+
+#endif

diff --git a/main/php_regex.h b/main/php_regex.h
index 91cbd994c41ddf195820699239b014c7ba3d5e1f..62279c4c08db29f5622a913a688bbdf1fa01bf9d 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -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

diff --git a/regex/regex_extra.h b/regex/regex_extra.h
index 511df57f675b689d0a98ba2036990940e5b8a66b..3db9e4ad1a8e8f53ede63074c38f2f275ac59912 100644 (file)
--- a/regex/regex_extra.h
+++ b/regex/regex_extra.h
@@ -1,3 +1,4 @@
+/* do not frame this - we must be able to include this file multiple times */
 
 #undef regexec
 #undef regerror
@@ -8,6 +9,8 @@
 
 #if !(WIN32|WINNT)
 
+#ifndef PHP_NO_ALIASES
+
 #define regexec php_regexec
 #define regerror php_regerror
 #define regfree php_regfree
@@ -16,3 +19,5 @@
 #endif
 
 #endif
+
+#endif