com php-src: woops: Zend/zend_object_handlers.h Zend/ze nd_objects_API.c

Commit: 9b663d9fee19640774c2bcf9fa4abf3ccef34008 Author: Joe Watkins <krakjoe@php.net> Fri, 18 Sep 2015 10:05:04 +0100 Parents: 433a3d21f2ef7a680e346b05aaa2174ca6592647 Branches: zend_get_property_guard_as_function_pointer Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b663d9fee19640774c2bcf9fa4abf3ccef34008 Log: woops Changed paths: M Zend/zend_object_handlers.h M Zend/zend_objects_API.c Diff: diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h index 9e5cc82..960e6d2 100644 --- a/Zend/zend_object_handlers.h +++ b/Zend/zend_object_handlers.h @@ -181,7 +181,7 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_string *prop_inf ZEND_API zend_function *zend_get_call_trampoline_func(zend_class_entry *ce, zend_string *method_name, int is_static); -ZEND_API zend_long* (*zend_get_property_guard)(zend_object *zobj, zend_string *member); +ZEND_API extern zend_long* (*zend_get_property_guard)(zend_object *zobj, zend_string *member); #define zend_free_trampoline(func) do { \ if ((func) == &EG(trampoline)) { \ diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 1490863..2d877ce 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -26,6 +26,8 @@ #include "zend_API.h" #include "zend_objects_API.h" +ZEND_API zend_long* (*zend_get_property_guard)(zend_object *zobj, zend_string *member); + ZEND_API void zend_objects_store_init(zend_objects_store *objects, uint32_t init_size) { objects->object_buckets = (zend_object **) emalloc(init_size * sizeof(zend_object*));