From a8e45d3968c8c5bdc34b800d3e2c68d416181470 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Wed, 7 May 2008 02:35:16 +0000 Subject: [PATCH] 2008-05-06 Ramiro Polla * mingwex/gdtoa/strtodnrp.c: Remove alias from strtod to __strtod. * include/stdlib.h: Define strtod to __strtod when __NO_ISOCEXT is not set. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/include/stdlib.h | 6 ++++-- winsup/mingw/mingwex/gdtoa/strtodnrp.c | 3 --- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index da2e79464..25ce0db75 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2008-05-06 Ramiro Polla + + * mingwex/gdtoa/strtodnrp.c: Remove alias from strtod to __strtod. + * include/stdlib.h: Define strtod to __strtod when __NO_ISOCEXT is not set. + 2008-05-04 Ramiro Polla * include/sys/types.h (useconds_t): typedef. diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index 0d6cf60be..693185c07 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -307,11 +307,13 @@ _CRTIMP long __cdecl __MINGW_NOTHROW atol (const char*); _CRTIMP int __cdecl __MINGW_NOTHROW _wtoi (const wchar_t *); _CRTIMP long __cdecl __MINGW_NOTHROW _wtol (const wchar_t *); #endif -_CRTIMP double __cdecl __MINGW_NOTHROW _strtod (const char*, char**); #if !defined __NO_ISOCEXT /* in libmingwex.a */ -double __cdecl __MINGW_NOTHROW strtod (const char*, char**); +double __cdecl __MINGW_NOTHROW __strtod (const char*, char**); +#define strtod __strtod float __cdecl __MINGW_NOTHROW strtof (const char * __restrict__, char ** __restrict__); long double __cdecl __MINGW_NOTHROW strtold (const char * __restrict__, char ** __restrict__); +#else +_CRTIMP double __cdecl __MINGW_NOTHROW strtod (const char*, char**); #endif /* __NO_ISOCEXT */ _CRTIMP long __cdecl __MINGW_NOTHROW strtol (const char*, char**, int); diff --git a/winsup/mingw/mingwex/gdtoa/strtodnrp.c b/winsup/mingw/mingwex/gdtoa/strtodnrp.c index 26d0fc3cc..ac81b2bbd 100755 --- a/winsup/mingw/mingwex/gdtoa/strtodnrp.c +++ b/winsup/mingw/mingwex/gdtoa/strtodnrp.c @@ -85,6 +85,3 @@ __strtod(CONST char *s, char **sp) u.L[_0] |= 0x80000000L; return u.d; } - -double __cdecl strtod(const char *s, char **sp) - __attribute__((alias("__strtod"))); -- 2.43.5