summaryrefslogtreecommitdiff
path: root/ext/date/php_date.c
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2014-07-17 23:11:33 +0300
committerLior Kaplan <kaplanlior@gmail.com>2014-07-17 23:11:33 +0300
commit46dcd12d53691009ab82745e2498fac1ba6073ac (patch)
tree870d30d952cb20a5578dd405b02c52c2828219cf /ext/date/php_date.c
parent3690e973d20ed10b30f85f2fb421976fa878052e (diff)
parent84673485f5b3134e357f6ec90bbaab9ffec11a68 (diff)
downloadphp-git-46dcd12d53691009ab82745e2498fac1ba6073ac.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Enable build without atoll (e.g old AIX flavours) Enable build without atoll (e.g old AIX flavours)
Diffstat (limited to 'ext/date/php_date.c')
-rw-r--r--ext/date/php_date.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 700929154c..a3cd5734d6 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -50,7 +50,11 @@ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i;
int st = snprintf(s, len, "%lld", i); \
s[st] = '\0'; \
} while (0);
+#ifdef HAVE_ATOLL
# define DATE_A64I(i, s) i = atoll(s)
+#else
+# define DATE_A64I(i, s) i = strtoll(s, NULL, 10)
+#endif
#endif
/* {{{ arginfo */