diff options
| author | Remi Collet <remi@php.net> | 2014-10-27 07:53:54 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-27 07:53:54 +0100 |
| commit | 2233625e02374339a7d10876b353c158fa39a5f9 (patch) | |
| tree | 4ffe5cc0f560030c5fbeeb79bbe8b72a2ade9eed /ext/gmp | |
| parent | c8e1fae17f215a71ffddf834ef8ca409dfd8e50b (diff) | |
| parent | cc91072f0ef69b5884f23eb758ef6e12e8858034 (diff) | |
| download | php-git-2233625e02374339a7d10876b353c158fa39a5f9.tar.gz | |
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
Diffstat (limited to 'ext/gmp')
| -rw-r--r-- | ext/gmp/gmp.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index b5e16845c2..d5d9f14c4b 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -359,30 +359,6 @@ static inline void gmp_zval_unary_ui_op(zval *return_value, zval *a_arg, gmp_una #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 void gmp_free_object_storage(zend_object *obj TSRMLS_DC) /* {{{ */ { gmp_object *intern = GET_GMP_OBJECT_FROM_OBJ(obj); @@ -687,8 +663,6 @@ ZEND_MINIT_FUNCTION(gmp) REGISTER_LONG_CONSTANT("GMP_BIG_ENDIAN", GMP_BIG_ENDIAN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("GMP_NATIVE_ENDIAN", GMP_NATIVE_ENDIAN, CONST_CS | CONST_PERSISTENT); - mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree); - return SUCCESS; } /* }}} */ |