epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix logic for when to define strtoll() and strtoull()

Browse Source 
Needed for MinGW and VxWorks when built against Base-3.15
This commit is contained in:
Andrew Johnson
2016-02-05 14:26:23 -06:00
parent ed5f48b353
commit 378def0a58
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/misc/parseToPOD.cpp
View File

@@ -250,17 +250,15 @@ epicsParseFloat(const char *str, float *to, char **units)
#endif
// MS Visual Studio 2013 defines strtoll, etc.
#if defined(_WIN32)
# if (_MSC_VER >= 1800)
# define WIN_NEEDS_OLL_FUNC 0
# else
# define WIN_NEEDS_OLL_FUNC 1
# endif
#if defined(_WIN32) && !defined(_MINGW)
# define NEED_OLL_FUNCS (_MSC_VER < 1800)
#elif defined(vxWorks)
# define NEED_OLL_FUNCS !defined(_WRS_VXWORKS_MAJOR)
#else
# define WIN_NEEDS_OLL_FUNC 0
# define NEED_OLL_FUNCS 0
#endif
#if defined(NEED_LONGLONG) && (defined(__vxworks) || WIN_NEEDS_OLL_FUNC)
#if defined(NEED_LONGLONG) && NEED_OLL_FUNCS
static
long long strtoll(const char *ptr, char ** endp, int base)
{