diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-11 14:23:05 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-11 14:23:05 +0400 |
| commit | 9b7759ae75bf5839d3a3aebcc13fffa674fabcf3 (patch) | |
| tree | 13a0aabeb6c064bc6bb544240b7d3fefb7760206 /newlib | |
| parent | 602cec7f1eb17b96525d09752fd1f0ad474e3202 (diff) | |
* libc/include/stdlib.h (strtof, strtoll, strtoull, strtold): Also
prototype if C++11 or later.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 6 | ||||
| -rw-r--r-- | newlib/libc/include/stdlib.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 2c4d024bb..4973819ac 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,4 +1,10 @@ +2012-04-11 Jon TURNEY <jon.turney@dronecode.org.uk> + + * libc/include/stdlib.h (strtof, strtoll, strtoull, strtold): Also + prototype if C++11 or later. + 2013-04-10 Bin Cheng <bin.cheng@arm.com> + * acconfig.h (_FSEEK_OPTIMIZATION): Undef * newlib.hin (_FSEEK_OPTIMIZATION): Undef * configure.in (--disable-newlib-fseek-optimization): New option. diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 5340e364b..c22c3876b 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -122,7 +122,7 @@ _PTR _EXFUN(reallocf,(_PTR __r, size_t __size)); _VOID _EXFUN(srand,(unsigned __seed)); double _EXFUN(strtod,(const char *__n, char **__end_PTR)); double _EXFUN(_strtod_r,(struct _reent *,const char *__n, char **__end_PTR)); -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) +#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (defined (__cplusplus) && __cplusplus >= 201103L) float _EXFUN(strtof,(const char *__n, char **__end_PTR)); #endif #ifndef __STRICT_ANSI__ @@ -186,13 +186,13 @@ long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr)); long long _EXFUN(llabs,(long long)); lldiv_t _EXFUN(lldiv,(long long __numer, long long __denom)); #endif /* ! __STRICT_ANSI__ */ -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) +#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (defined (__cplusplus) && __cplusplus >= 201103L) long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base)); #endif #ifndef __STRICT_ANSI__ long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base)); #endif /* ! __STRICT_ANSI__ */ -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) +#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (defined (__cplusplus) && __cplusplus >= 201103L) unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base)); #endif #ifndef __STRICT_ANSI__ @@ -224,7 +224,7 @@ _VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *)) /* On platforms where long double equals double. */ #ifdef _LDBL_EQ_DBL -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) +#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (defined (__cplusplus) && __cplusplus >= 201103L) extern long double strtold (const char *, char **); #endif extern long double wcstold (const wchar_t *, wchar_t **); |