diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/intl/collator/collator_is_numeric.c | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/intl/collator/collator_is_numeric.c')
| -rw-r--r-- | ext/intl/collator/collator_is_numeric.c | 15 |
1 files changed, 2 insertions, 13 deletions
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) { |