Move the macro wrappers from the compatibility header to php.h

diff --git a/main/php.h b/main/php.h
index c4e2b4657b4cfc1415a573d2877bacd793d92a38..bab959ed9a1a0834575531fe5fec951fb7a31430 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -250,6 +250,42 @@ PHPAPI int cfg_get_double(char *varname, double *result);
 PHPAPI int cfg_get_string(char *varname, char **result);
 
 
+/* PHP-named Zend macro wrappers */
+#define PHP_FN                                 ZEND_FN
+#define PHP_NAMED_FUNCTION             ZEND_NAMED_FUNCTION
+#define PHP_FUNCTION                   ZEND_FUNCTION
+
+#define PHP_NAMED_FE   ZEND_NAMED_FE
+#define PHP_FE                 ZEND_FE
+#define PHP_FALIAS             ZEND_FALIAS
+#define PHP_STATIC_FE  ZEND_STATIC_FE
+
+#define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N
+#define PHP_MODULE_SHUTDOWN_N  ZEND_MODULE_SHUTDOWN_N
+#define PHP_MODULE_ACTIVATE_N  ZEND_MODULE_ACTIVATE_N
+#define PHP_MODULE_DEACTIVATE_N        ZEND_MODULE_DEACTIVATE_N
+#define PHP_MODULE_INFO_N              ZEND_MODULE_INFO_N
+
+#define PHP_MODULE_STARTUP_D   ZEND_MODULE_STARTUP_D
+#define PHP_MODULE_SHUTDOWN_D  ZEND_MODULE_SHUTDOWN_D
+#define PHP_MODULE_ACTIVATE_D  ZEND_MODULE_ACTIVATE_D
+#define PHP_MODULE_DEACTIVATE_D        ZEND_MODULE_DEACTIVATE_D
+#define PHP_MODULE_INFO_D              ZEND_MODULE_INFO_D
+
+/* Compatibility macros */
+#define PHP_MINIT              ZEND_MODULE_STARTUP_N
+#define PHP_MSHUTDOWN  ZEND_MODULE_SHUTDOWN_N
+#define PHP_RINIT              ZEND_MODULE_ACTIVATE_N
+#define PHP_RSHUTDOWN  ZEND_MODULE_DEACTIVATE_N
+#define PHP_MINFO              ZEND_MODULE_INFO_N
+
+#define PHP_MINIT_FUNCTION             ZEND_MODULE_STARTUP_D
+#define PHP_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D
+#define PHP_RINIT_FUNCTION             ZEND_MODULE_ACTIVATE_D
+#define PHP_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D
+#define PHP_MINFO_FUNCTION             ZEND_MODULE_INFO_D
+
+
 /* Output support */
 #include "main/php_output.h"
 #define PHPWRITE(str, str_len)         php_body_write((str), (str_len) TSRMLS_CC)

diff --git a/main/php3_compat.h b/main/php3_compat.h
index 477c00c9df3afb846ff705e057ba069428139504..4093a79a906346e386acf3311a3068c2da61a970 100644 (file)
--- a/main/php3_compat.h
+++ b/main/php3_compat.h
@@ -99,26 +99,4 @@ typedef zval pval;
 
 #define list_entry                     zend_rsrc_list_entry
 
-/* Compatibility macros */
-#define PHP_FN(name)                           ZEND_FN(name)
-#define PHP_NAMED_FUNCTION(name)       ZEND_NAMED_FUNCTION(name)
-#define PHP_FUNCTION(name)                     ZEND_FUNCTION(name)
-
-#define PHP_NAMED_FE(php_name, name, arg_types)        ZEND_NAMED_FE(php_name, name, arg_types)
-#define PHP_FE(name, arg_types)                                        ZEND_FE(name, arg_types)
-#define PHP_FALIAS(name, alias, arg_types)             ZEND_FALIAS(name, alias, arg_types)
-#define PHP_STATIC_FE(php_name, func_name, arg_types) ZEND_STATIC_FE(php_name, func_name, arg_types)
-
-#define PHP_MINIT(module)              ZEND_MODULE_STARTUP_N(module)
-#define PHP_MSHUTDOWN(module)  ZEND_MODULE_SHUTDOWN_N(module)
-#define PHP_RINIT(module)              ZEND_MODULE_ACTIVATE_N(module)
-#define PHP_RSHUTDOWN(module)  ZEND_MODULE_DEACTIVATE_N(module)
-#define PHP_MINFO(module)              ZEND_MODULE_INFO_N(module)
-
-#define PHP_MINIT_FUNCTION(module)             ZEND_MODULE_STARTUP_D(module)
-#define PHP_MSHUTDOWN_FUNCTION(module) ZEND_MODULE_SHUTDOWN_D(module)
-#define PHP_RINIT_FUNCTION(module)             ZEND_MODULE_ACTIVATE_D(module)
-#define PHP_RSHUTDOWN_FUNCTION(module) ZEND_MODULE_DEACTIVATE_D(module)
-#define PHP_MINFO_FUNCTION(module)             ZEND_MODULE_INFO_D(module)
-
 #endif                                                 /* PHP3_COMPAT_H */