diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-07-17 23:04:23 +0300 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-07-17 23:04:23 +0300 |
| commit | 3e1b749f5e9e96245fc8801effa216d7f407867d (patch) | |
| tree | d6818a728bf1be0109813bcff63006edc50ffe15 /ext/date/php_date.c | |
| parent | b5324acd351b9b0c27bfee10d41aa579c1b442eb (diff) | |
| parent | 2dff153b23c7c874e8c98e1f3bda2e00cde0bd71 (diff) | |
| download | php-git-3e1b749f5e9e96245fc8801effa216d7f407867d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 718924178c..6ff05868a6 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 */ |