From acb460af9e66d83401341d9af04984ce53eed0f0 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Wed, 19 Mar 2014 16:53:19 +0000 Subject: [PATCH] Use strtoll as defined by windows_port.h for strto64. --- src/util.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/util.h b/src/util.h index de94091..366e1be 100644 --- a/src/util.h +++ b/src/util.h @@ -58,16 +58,13 @@ namespace GFLAGS_NAMESPACE { // This is used for unittests for death-testing. It is defined in gflags.cc. extern GFLAGS_DLL_DECL void (*gflags_exitfunc)(int); -// Work properly if either strtoll or strtoq is on this system -#if defined(HAVE_STRTOLL) +// Work properly if either strtoll or strtoq is on this system. +#if defined(strtoll) || defined(HAVE_STRTOLL) # define strto64 strtoll # define strtou64 strtoull #elif defined(HAVE_STRTOQ) # define strto64 strtoq # define strtou64 strtouq -#elif defined(OS_WINDOWS) -# define strto64 _strtoi64 -# define strtou64 _strtoui64 // Neither strtoll nor strtoq are defined. I hope strtol works! #else # define strto64 strtol