diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-18 16:27:31 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-18 16:27:31 +0800 |
| commit | 6cc487df2c464224e28c3869599e0c110df03897 (patch) | |
| tree | d2f196d8eece9252c69e545393efae99feef5e9e /Zend/zend.h | |
| parent | 110bf9c720d02b49a1a5d0c6e8affe65f9aa01db (diff) | |
| download | php-git-6cc487df2c464224e28c3869599e0c110df03897.tar.gz | |
Revert "stash" (pushed by accident)
This reverts commit a18bf5fc9303e2739ee7026bdb3bbf272bf4baa8.
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index bfdbf5b9dc..1021829c3b 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -303,10 +303,8 @@ 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 @@ -746,7 +744,7 @@ END_EXTERN_C() ZEND_ASSERT(Z_ISREF_P(_z)); \ ref = Z_REF_P(_z); \ ZVAL_COPY_VALUE(_z, &ref->val); \ - efree_size(ref, sizeof(zend_reference)); \ + efree(ref); \ } while (0) #define SEPARATE_STRING(zv) do { \ |