MFB: move empty_fcall_info* to const table

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index e04716a21875c23fe486abafcb05317eb667ef7f..169b6ac5885c8bd7ba6d0e749b051d59ce461ff6 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1556,8 +1556,8 @@ ZEND_API int add_property_zstrl_ex(zval *arg, char *key, uint key_len, zend_ucha
 ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, zend_uint param_count, zval *params[] TSRMLS_DC);
 ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
 
-ZEND_API extern zend_fcall_info empty_fcall_info;
-ZEND_API extern zend_fcall_info_cache empty_fcall_info_cache;
+ZEND_API extern const zend_fcall_info empty_fcall_info;
+ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
 
 /** Build zend_call_info/cache from a zval*
  *

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 5a164e854401fef500ebcb2313e5817d4eb69141..7abf272872c9189c8380f5e71ec0fb83bee5de70 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -40,8 +40,8 @@ ZEND_API void (*zend_execute)(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
 
 /* true globals */
-ZEND_API zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0 };
-ZEND_API zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };
+ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0 };
+ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };
 
 #ifdef ZEND_WIN32
 #include <process.h>