diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-18 15:52:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-18 16:25:43 +0800 |
| commit | 110bf9c720d02b49a1a5d0c6e8affe65f9aa01db (patch) | |
| tree | 9d377d071e33efcbbc3c60f3218a557216edfd71 /ext/date/php_date.c | |
| parent | 4e378844abbfbc7fec88d063ee0bf2e9026b6b6a (diff) | |
| parent | f6f621ef69a5a9bf20e94c2714bdebae73860927 (diff) | |
| download | php-git-110bf9c720d02b49a1a5d0c6e8affe65f9aa01db.tar.gz | |
Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
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 758d0f9513..78251383e1 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 */ |