diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:31:20 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:31:20 +0000 |
| commit | 70141093a731049ee9220e9e965f61ded56ed4d5 (patch) | |
| tree | 6e67b382253a186889bfdc37c31062d6fb9880d9 /ext/intl | |
| parent | e453af3851daf08f5af9b45fc7819c3a9c336f1e (diff) | |
| parent | 97294aca7e066443291cc2d77f8674ac23eabb32 (diff) | |
| download | php-git-70141093a731049ee9220e9e965f61ded56ed4d5.tar.gz | |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'ext/intl')
| -rw-r--r-- | ext/intl/collator/collator_convert.c | 8 | ||||
| -rw-r--r-- | ext/intl/collator/collator_is_numeric.c | 15 |
2 files changed, 3 insertions, 20 deletions
diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert.c index 8f06c8f1ca..2d431a19d6 100644 --- a/ext/intl/collator/collator_convert.c +++ b/ext/intl/collator/collator_convert.c @@ -28,12 +28,6 @@ #include <unicode/ustring.h> #include <php.h> -#if PHP_VERSION_ID <= 50100 -#define CAST_OBJECT_SHOULD_FREE ,0 -#else -#define CAST_OBJECT_SHOULD_FREE -#endif - #define COLLATOR_CONVERT_RETURN_FAILED(retval) { \ Z_TRY_ADDREF_P(retval); \ return retval; \ @@ -258,7 +252,7 @@ zval* collator_convert_object_to_string( zval* obj, zval *rv ) { zstr = rv; - if( Z_OBJ_HT_P(obj)->cast_object( obj, zstr, IS_STRING CAST_OBJECT_SHOULD_FREE ) == FAILURE ) + if( Z_OBJ_HT_P(obj)->cast_object( obj, zstr, IS_STRING ) == FAILURE ) { /* cast_object failed => bail out. */ zval_ptr_dtor( zstr ); diff --git a/ext/intl/collator/collator_is_numeric.c b/ext/intl/collator/collator_is_numeric.c index 6b0568dd64..4f6efbfa6d 100644 --- a/ext/intl/collator/collator_is_numeric.c +++ b/ext/intl/collator/collator_is_numeric.c @@ -17,17 +17,6 @@ #include "collator_is_numeric.h" -#if ZEND_MODULE_API_NO < 20071006 -/* not 5.3 */ -#ifndef ALLOCA_FLAG -#define ALLOCA_FLAG(use_heap) -#endif -#define _do_alloca(x, y) do_alloca((x)) -#define _free_alloca(x, y) free_alloca((x)) -#else -#define _do_alloca do_alloca -#define _free_alloca free_alloca -#endif /* {{{ collator_u_strtod * Taken from PHP6:zend_u_strtod() */ @@ -87,7 +76,7 @@ static double collator_u_strtod(const UChar *nptr, UChar **endptr) /* {{{ */ if (length < sizeof(buf)) { numbuf = buf; } else { - numbuf = (char *) _do_alloca(length + 1, use_heap); + numbuf = (char *) do_alloca(length + 1, use_heap); } bufpos = numbuf; @@ -100,7 +89,7 @@ static double collator_u_strtod(const UChar *nptr, UChar **endptr) /* {{{ */ value = zend_strtod(numbuf, NULL); if (numbuf != buf) { - _free_alloca(numbuf, use_heap); + free_alloca(numbuf, use_heap); } if (endptr != NULL) { |