Avoid issue by undefining strtod ... git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2827 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h index 5089c9e..79f3f59 100644 --- a/mingw-w64-headers/crt/stdlib.h +++ b/mingw-w64-headers/crt/stdlib.h
@@ -378,13 +378,23 @@ #ifdef _CRT_RAND_S _CRTIMP errno_t __cdecl rand_s(unsigned int *randomValue); #endif -#if !defined __NO_ISOCEXT && (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) + double __cdecl __MINGW_NOTHROW strtod(const char *_Str,char **_EndPtr); + float __cdecl __MINGW_NOTHROW strtof(const char *nptr, char **endptr); + long double __cdecl __MINGW_NOTHROW strtold(const char *, char **); +#if !defined __NO_ISOCEXT /* libmingwex.a provides a c99-compliant strtod() exported as __strtod() */ + extern double __cdecl __MINGW_NOTHROW + __strtod (const char*, char**); +#ifdef __cplusplus +__inline__ double __cdecl __MINGW_NOTHROW +strtod (const char* __nptr, char** __endptr) +{ + return __strtod(__nptr, __endptr); +} +#endif #define strtod __strtod -#endif /* __STDC_VERSION__ >= 199901L */ - double __cdecl strtod(const char *_Str,char **_EndPtr); - float __cdecl strtof(const char *nptr, char **endptr); - long double __cdecl strtold(const char *, char **); +#endif /* __NO_ISOCEXT */ + #if !defined __NO_ISOCEXT /* in libmingwex.a */ float __cdecl __mingw_strtof (const char * __restrict__, char ** __restrict__); long double __cdecl __mingw_strtold(const char * __restrict__, char ** __restrict__);