Skip to content

Commit a2dd662

Browse files
zsuraskizsuraski
committed
Move the macro wrappers from the compatibility header to php.h
1 parent f5ea49a commit a2dd662

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

‎main/php.h

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,42 @@ PHPAPI int cfg_get_double(char *varname, double *result);
250250
PHPAPI int cfg_get_string(char *varname, char **result);
251251

252252

253+
/* PHP-named Zend macro wrappers */
254+
#define PHP_FN ZEND_FN
255+
#define PHP_NAMED_FUNCTION ZEND_NAMED_FUNCTION
256+
#define PHP_FUNCTION ZEND_FUNCTION
257+
258+
#define PHP_NAMED_FE ZEND_NAMED_FE
259+
#define PHP_FE ZEND_FE
260+
#define PHP_FALIAS ZEND_FALIAS
261+
#define PHP_STATIC_FE ZEND_STATIC_FE
262+
263+
#define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N
264+
#define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N
265+
#define PHP_MODULE_ACTIVATE_N ZEND_MODULE_ACTIVATE_N
266+
#define PHP_MODULE_DEACTIVATE_N ZEND_MODULE_DEACTIVATE_N
267+
#define PHP_MODULE_INFO_N ZEND_MODULE_INFO_N
268+
269+
#define PHP_MODULE_STARTUP_D ZEND_MODULE_STARTUP_D
270+
#define PHP_MODULE_SHUTDOWN_D ZEND_MODULE_SHUTDOWN_D
271+
#define PHP_MODULE_ACTIVATE_D ZEND_MODULE_ACTIVATE_D
272+
#define PHP_MODULE_DEACTIVATE_D ZEND_MODULE_DEACTIVATE_D
273+
#define PHP_MODULE_INFO_D ZEND_MODULE_INFO_D
274+
275+
/* Compatibility macros */
276+
#define PHP_MINIT ZEND_MODULE_STARTUP_N
277+
#define PHP_MSHUTDOWN ZEND_MODULE_SHUTDOWN_N
278+
#define PHP_RINIT ZEND_MODULE_ACTIVATE_N
279+
#define PHP_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N
280+
#define PHP_MINFO ZEND_MODULE_INFO_N
281+
282+
#define PHP_MINIT_FUNCTION ZEND_MODULE_STARTUP_D
283+
#define PHP_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D
284+
#define PHP_RINIT_FUNCTION ZEND_MODULE_ACTIVATE_D
285+
#define PHP_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D
286+
#define PHP_MINFO_FUNCTION ZEND_MODULE_INFO_D
287+
288+
253289
/* Output support */
254290
#include "main/php_output.h"
255291
#define PHPWRITE(str, str_len) php_body_write((str), (str_len) TSRMLS_CC)

‎main/php3_compat.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,4 @@ typedef zval pval;
9999

100100
#define list_entry zend_rsrc_list_entry
101101

102-
/* Compatibility macros */
103-
#define PHP_FN(name) ZEND_FN(name)
104-
#define PHP_NAMED_FUNCTION(name) ZEND_NAMED_FUNCTION(name)
105-
#define PHP_FUNCTION(name) ZEND_FUNCTION(name)
106-
107-
#define PHP_NAMED_FE(php_name, name, arg_types) ZEND_NAMED_FE(php_name, name, arg_types)
108-
#define PHP_FE(name, arg_types) ZEND_FE(name, arg_types)
109-
#define PHP_FALIAS(name, alias, arg_types) ZEND_FALIAS(name, alias, arg_types)
110-
#define PHP_STATIC_FE(php_name, func_name, arg_types) ZEND_STATIC_FE(php_name, func_name, arg_types)
111-
112-
#define PHP_MINIT(module) ZEND_MODULE_STARTUP_N(module)
113-
#define PHP_MSHUTDOWN(module) ZEND_MODULE_SHUTDOWN_N(module)
114-
#define PHP_RINIT(module) ZEND_MODULE_ACTIVATE_N(module)
115-
#define PHP_RSHUTDOWN(module) ZEND_MODULE_DEACTIVATE_N(module)
116-
#define PHP_MINFO(module) ZEND_MODULE_INFO_N(module)
117-
118-
#define PHP_MINIT_FUNCTION(module) ZEND_MODULE_STARTUP_D(module)
119-
#define PHP_MSHUTDOWN_FUNCTION(module) ZEND_MODULE_SHUTDOWN_D(module)
120-
#define PHP_RINIT_FUNCTION(module) ZEND_MODULE_ACTIVATE_D(module)
121-
#define PHP_RSHUTDOWN_FUNCTION(module) ZEND_MODULE_DEACTIVATE_D(module)
122-
#define PHP_MINFO_FUNCTION(module) ZEND_MODULE_INFO_D(module)
123-
124102
#endif /* PHP3_COMPAT_H */

0 commit comments

Comments
 (0)