diff options
| author | Antony Dovgal <tony2001@php.net> | 2011-11-02 21:12:13 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2011-11-02 21:12:13 +0000 |
| commit | ed276758f7dab1b8d0902f37e1bf08e96a46b105 (patch) | |
| tree | 440828e91bfc8a94ce62b7573c927e63abed16cc | |
| parent | 8d520d62961cd4d474db8cba7a2e615c78dfb17c (diff) | |
| download | php-git-ed276758f7dab1b8d0902f37e1bf08e96a46b105.tar.gz | |
fix folding, ws and cs
| -rw-r--r-- | Zend/zend_compile.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index aa32e71d45..567bc5f792 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3787,8 +3787,11 @@ static void zend_traits_duplicate_function(zend_function *fe, zend_class_entry * } /* }}} */ -static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint mname_len, zend_function* fe TSRMLS_DC) { - if ( !strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) { ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE; } +static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint mname_len, zend_function* fe TSRMLS_DC) /* {{{ */ +{ + if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) { + ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE; + } else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) { if (ce->constructor) { zend_error(E_COMPILE_ERROR, "%s has colliding constructor definitions coming from traits", ce->name); @@ -3817,7 +3820,7 @@ static void zend_add_magic_methods(zend_class_entry* ce, const char* mname, uint str_efree(lowercase_name); } } - +/* }}} */ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { |