From ad00b6465a9516ebb48e06500450d4e50afb2af3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 11 Apr 2016 11:33:05 -0500 Subject: [PATCH] Fix VxWorks build, add explanatory comments --- src/misc/parseToPOD.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp index b8eb552..61891ed 100644 --- a/src/misc/parseToPOD.cpp +++ b/src/misc/parseToPOD.cpp @@ -251,10 +251,13 @@ epicsParseFloat(const char *str, float *to, char **units) // Sometimes we have to provide our own copy of strtoll() #if defined(_WIN32) && !defined(_MINGW) +// 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) +// On VxWorks, Base-3.15 provides strtoll() # define NEED_OLL_FUNCS (EPICS_VERSION_INT < VERSION_INT(3,15,0,1)) -#elif defined(vxWorks) && !defined(_WRS_VXWORKS_MAJOR) -# define NEED_OLL_FUNCS 1 #else +// Other architectures all provide strtoll() # define NEED_OLL_FUNCS 0 #endif