Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

weltling · weltling · commit 6696cbcc9af0 · 2014-07-21T10:07:39.000+02:00
* origin/PHP-5.6:
  force atoll macro usage on windows
diff --git 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
