From deccc41b9a6e1c87eb024d11f9bf49feb5de5dba Mon Sep 17 00:00:00 2001 From: MJGaughran Date: Sat, 2 Mar 2019 19:11:42 +0000 Subject: [PATCH] Disabled NEED_OLL_FUNCS for Visual Studio 2013+ (#64) * Disabled NEED_OLL_FUNCS for Visual Studio 2013+ Both _MSC_VER (VC++ compiler version) and EPICS base version should be checked for strtoll, strtoull definitions. * NEED_OLL_FUNCS now defined only for VS builds --- src/misc/parseToPOD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp index 74afdcf..2691d48 100644 --- a/src/misc/parseToPOD.cpp +++ b/src/misc/parseToPOD.cpp @@ -254,7 +254,7 @@ epicsParseFloat(const char *str, float *to, char **units) #endif // Sometimes we have to provide our own copy of strtoll() -#if defined(_WIN32) && !defined(_MINGW) +#if defined(_MSC_VER) && _MSC_VER < 1800 // On Windows with MSVC, Base-3.15 provides strtoll() # define NEED_OLL_FUNCS (EPICS_VERSION_INT < VERSION_INT(3,15,0,1)) #elif defined(vxWorks)