com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c

From: Date: Mon, 27 Oct 2014 06:53:54 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/gmp/gmp.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82682@lists.php.net to get a copy of this message
Commit: 2233625e02374339a7d10876b353c158fa39a5f9 Author: Remi Collet <remi@php.net> Mon, 27 Oct 2014 07:53:54 +0100 Parents: c8e1fae17f215a71ffddf834ef8ca409dfd8e50b cc91072f0ef69b5884f23eb758ef6e12e8858034 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2233625e02374339a7d10876b353c158fa39a5f9 Log: Merge branch 'PHP-5.6' * PHP-5.6: NEWS NEWS Fix bug #63595 GMP memory management conflicts with other libraries using GMP Conflicts: ext/gmp/gmp.c Bugs: https://bugs.php.net/63595 Changed paths: MM ext/gmp/gmp.c Diff: diff --cc ext/gmp/gmp.c index b5e1684,e9c1ad3..d5d9f14 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@@ -359,36 -363,25 +359,12 @@@ static inline void gmp_zval_unary_ui_op #define gmp_unary_opl(op) _gmp_unary_opl(INTERNAL_FUNCTION_PARAM_PASSTHRU, op) #define gmp_unary_ui_op(op) _gmp_unary_ui_op(INTERNAL_FUNCTION_PARAM_PASSTHRU, op) - /* {{{ gmp_emalloc - */ - static void *gmp_emalloc(size_t size) - { - return emalloc(size); - } - /* }}} */ - - /* {{{ gmp_erealloc - */ - static void *gmp_erealloc(void *ptr, size_t old_size, size_t new_size) - { - return erealloc(ptr, new_size); - } - /* }}} */ - - /* {{{ gmp_efree - */ - static void gmp_efree(void *ptr, size_t size) - { - efree(ptr); - } - /* }}} */ - -static inline long gmp_get_long(zval *zv) /* {{{ */ +static void gmp_free_object_storage(zend_object *obj TSRMLS_DC) /* {{{ */ { - if (Z_TYPE_P(zv) == IS_LONG) { - return Z_LVAL_P(zv); - } else { - zval tmp_zv; - MAKE_COPY_ZVAL(&zv, &tmp_zv); - convert_to_long(&tmp_zv); - return Z_LVAL(tmp_zv); - } -} -/* }}} */ + gmp_object *intern = GET_GMP_OBJECT_FROM_OBJ(obj); -static void gmp_free_object_storage(gmp_object *intern TSRMLS_DC) /* {{{ */ -{ mpz_clear(intern->num); - zend_object_std_dtor(&intern->std TSRMLS_CC); - efree(intern); } /* }}} */

« previous php.cvs (#82682) next »