summaryrefslogtreecommitdiff
path: root/Zend/zend.h
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-07-16 16:35:48 +0800
committerXinchen Hui <laruence@php.net>2014-07-16 16:35:48 +0800
commita18bf5fc9303e2739ee7026bdb3bbf272bf4baa8 (patch)
tree134ea622631a3196839d0325d73487e5b23e658d /Zend/zend.h
parent8217e20ddb16303ca75cd61d9176e41e3b35edb3 (diff)
downloadphp-git-a18bf5fc9303e2739ee7026bdb3bbf272bf4baa8.tar.gz
stash
Diffstat (limited to 'Zend/zend.h')
-rw-r--r--Zend/zend.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend.h b/Zend/zend.h
index 1021829c3b..bfdbf5b9dc 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -303,8 +303,10 @@ typedef enum {
!(EG(current_execute_data)->prev_execute_data->opline->result_type & EXT_TYPE_UNUSED))
#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__)
+# define ZEND_NORETURN __attribute__((noreturn))
void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn));
#else
+# define ZEND_NORETURN
# define zend_error_noreturn zend_error
#endif
@@ -744,7 +746,7 @@ END_EXTERN_C()
ZEND_ASSERT(Z_ISREF_P(_z)); \
ref = Z_REF_P(_z); \
ZVAL_COPY_VALUE(_z, &ref->val); \
- efree(ref); \
+ efree_size(ref, sizeof(zend_reference)); \
} while (0)
#define SEPARATE_STRING(zv) do { \