[BACK]Return to zend_API.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_API.h between versions 1.1.1.2 and 1.1.1.4

version 1.1.1.2, 2012/05/29 12:34:35 version 1.1.1.4, 2014/06/15 20:04:03
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 60  typedef struct _zend_fcall_info_cache { Line 60  typedef struct _zend_fcall_info_cache {
         zval *object_ptr;          zval *object_ptr;
 } zend_fcall_info_cache;  } zend_fcall_info_cache;
   
#define ZEND_NS_NAME(ns, name)                  ns"\\"name#define ZEND_NS_NAME(ns, name)                  ns "\\" name
   
 #define ZEND_FN(name) zif_##name  #define ZEND_FN(name) zif_##name
 #define ZEND_MN(name) zim_##name  #define ZEND_MN(name) zim_##name
Line 90  typedef struct _zend_fcall_info_cache { Line 90  typedef struct _zend_fcall_info_cache {
 #define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags)        ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)  #define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags)        ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
 #define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info)                     ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)  #define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info)                     ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)
   
#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0)
 #define ZEND_NS_FE(ns, name, arg_info)                                  ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)  #define ZEND_NS_FE(ns, name, arg_info)                                  ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
 #define ZEND_NS_DEP_FE(ns, name, arg_info)                              ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)  #define ZEND_NS_DEP_FE(ns, name, arg_info)                              ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
 #define ZEND_NS_FALIAS(ns, name, alias, arg_info)               ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)  #define ZEND_NS_FALIAS(ns, name, alias, arg_info)               ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
Line 175  typedef struct _zend_fcall_info_cache { Line 175  typedef struct _zend_fcall_info_cache {
                         class_container.name = zend_strndup(cl_name, _len);     \                          class_container.name = zend_strndup(cl_name, _len);     \
                 }                                                                                                               \                  }                                                                                                               \
                 class_container.name_length = _len;                                             \                  class_container.name_length = _len;                                             \
                   INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
           }
   
   #define INIT_CLASS_ENTRY_INIT_METHODS(class_container, functions, handle_fcall, handle_propget, handle_propset, handle_propunset, handle_propisset) \
           {                                                                                                                       \
                 class_container.constructor = NULL;                                             \                  class_container.constructor = NULL;                                             \
                 class_container.destructor = NULL;                                              \                  class_container.destructor = NULL;                                              \
                 class_container.clone = NULL;                                                   \                  class_container.clone = NULL;                                                   \
Line 274  ZEND_API void zend_class_implements(zend_class_entry * Line 279  ZEND_API void zend_class_implements(zend_class_entry *
 ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC);  ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC);
   
 #define zend_register_class_alias(name, ce) \  #define zend_register_class_alias(name, ce) \
        zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_DC)        zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC)
 #define zend_register_ns_class_alias(ns, name, ce) \  #define zend_register_ns_class_alias(ns, name, ce) \
        zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_DC)        zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC)
   
 ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC);  ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC);
 ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC);  ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC);
Line 456  ZEND_API extern const zend_fcall_info_cache empty_fcal Line 461  ZEND_API extern const zend_fcall_info_cache empty_fcal
  */   */
 ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);  ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);
   
/** Clear argumens connected with zend_fcall_info *fci/** Clear arguments connected with zend_fcall_info *fci
  * If free_mem is not zero then the params array gets free'd as well   * If free_mem is not zero then the params array gets free'd as well
  */   */
 ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);  ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
Line 494  ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci Line 499  ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci
 ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);  ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
   
 /** Call a function using information created by zend_fcall_info_init()/args().  /** Call a function using information created by zend_fcall_info_init()/args().
 * If args is given then those replace the arguement info in fci is temporarily. * If args is given then those replace the argument info in fci is temporarily.
  */   */
 ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);  ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
   
Line 511  ZEND_API int zend_delete_global_variable_ex(const char Line 516  ZEND_API int zend_delete_global_variable_ex(const char
 ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);  ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);
   
 ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);  ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);
   
   ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len);
   ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
   
 #define add_method(arg, key, method)    add_assoc_function((arg), (key), (method))  #define add_method(arg, key, method)    add_assoc_function((arg), (key), (method))
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>