diff options
| author | Anatol Belski <ab@php.net> | 2014-07-21 10:01:48 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-21 10:01:48 +0200 |
| commit | 833e4669832137edbc4526a0d7c10f16396554a0 (patch) | |
| tree | 8e23f226124311a96e2ca503a078b3248b368be5 | |
| parent | 128eda843f7dff487fff529a384fee3c5494e0f6 (diff) | |
| parent | f6d941e4b451a09c80e852a2f9d54e41591c36d2 (diff) | |
| download | php-git-833e4669832137edbc4526a0d7c10f16396554a0.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
force atoll macro usage on windows
| -rw-r--r-- | main/rfc1867.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/rfc1867.c b/main/rfc1867.c index c93472f5a1..806a292872 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -36,6 +36,7 @@ #if defined(PHP_WIN32) && !defined(HAVE_ATOLL) # define atoll(s) _atoi64(s) +# define HAVE_ATOLL 1 #endif #define DEBUG_FILE_UPLOAD ZEND_DEBUG |