From: Anatol Belski <ab@php.net>
Date: Tue, 10 Feb 2015 12:06:24 +0000 (+0100)
Subject: use portable strtol
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~204
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a875e18fdebfe3af530a6c4367d893c1cb811ae;p=php

use portable strtol
---

diff --git a/ext/json/json_scanner.c b/ext/json/json_scanner.c
index 2cfd8b84be..d4e6cf293c 100644
--- a/ext/json/json_scanner.c
+++ b/ext/json/json_scanner.c
@@ -267,7 +267,7 @@ yy16:
 			}
 		}
 		if (!bigint) {
-			ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));
+			ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));
 			return PHP_JSON_T_INT;
 		} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {
 			ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);
diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re
index 28743e5453..cbbfa41e5a 100644
--- a/ext/json/json_scanner.re
+++ b/ext/json/json_scanner.re
@@ -171,7 +171,7 @@ std:
 			}
 		}
 		if (!bigint) {
-			ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10));
+			ZVAL_LONG(&s->value, ZEND_STRTOL((char *) s->token, NULL, 10));
 			return PHP_JSON_T_INT;
 		} else if (s->options & PHP_JSON_BIGINT_AS_STRING) {
 			ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token);