Prefer strtoll over atoll

Both are specified by C99, but strtoll has specified overflow
behavior while atoll does not, so prefer using it.

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 8f755d887f18e1c59162023a384f2ea84579a9ba..d81bc1659a990c617cabc2398adfe51d99c926ec 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -51,11 +51,7 @@ 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
+#define DATE_A64I(i, s) i = strtoll(s, NULL, 10)
 #endif
 
 PHPAPI time_t php_time(void)

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 9dcd5ad07f32ae737620d41dc6f9156b0508ff05..8ef83f443dc2e3be457a7c02480651fa63571b81 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -31,11 +31,6 @@
 #include "ext/standard/php_string.h"
 #include "zend_smart_string.h"
 
-#if defined(PHP_WIN32) && !defined(HAVE_ATOLL)
-# define atoll(s) _atoi64(s)
-# define HAVE_ATOLL 1
-#endif
-
 #ifndef DEBUG_FILE_UPLOAD
 # define DEBUG_FILE_UPLOAD 0
 #endif
@@ -903,11 +898,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
                                }
 
                                if (!strcasecmp(param, "MAX_FILE_SIZE")) {
-#ifdef HAVE_ATOLL
-                                       max_file_size = atoll(value);
-#else
                                        max_file_size = strtoll(value, NULL, 10);
-#endif
                                }
 
                                efree(param);