fix compilation under VS 2013

This is essentially a copy of corresponding chromium change from:
https://codereview.chromium.org/27017003

2 files changed, 3 insertions, 0 deletions

diff --git a/src/windows/port.cc b/src/windows/port.cc
index e3b1921..2e5f857 100644
--- a/src/windows/port.cc
+++ b/src/windows/port.cc
@@ -41,6 +41,7 @@
 #include <string.h>    // for strlen(), memset(), memcmp()
 #include <assert.h>
 #include <stdarg.h>    // for va_list, va_start, va_end
+#include <algorithm>   // for std:{min,max}
 #include <windows.h>
 #include "port.h"
 #include "base/logging.h"
diff --git a/src/windows/port.h b/src/windows/port.h
index c66a296..333fcad 100644
--- a/src/windows/port.h
+++ b/src/windows/port.h
@@ -456,6 +456,7 @@ inline int nanosleep(const struct timespec *req, struct timespec *rem) {
 #endif
 
 #ifndef __MINGW32__
+#if _MSC_VER < 1800
 inline long long int strtoll(const char *nptr, char **endptr, int base) {
     return _strtoi64(nptr, endptr, base);
 }
@@ -463,6 +464,7 @@ inline unsigned long long int strtoull(const char *nptr, char **endptr,
                                        int base) {
     return _strtoui64(nptr, endptr, base);
 }
+#endif
 inline long long int strtoq(const char *nptr, char **endptr, int base) {
     return _strtoi64(nptr, endptr, base);
 }