From 7a84e9c4bcf9d38a7400bf797e5a4ec8d200b916 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 10 Oct 2014 14:43:19 +0000 Subject: [PATCH] * libc/include/_ansi.h: _LONG_LONG_TYPE definition removed. * libc/include/math.h: _LONG_LONG_TYPE replaced by "long long". Guards for C99 and C++11 functions fixed. * libc/include/stdlib.h: Guards for C99 and C++11 functions fixed. --- newlib/ChangeLog | 31 +++++++++++++++++++------------ newlib/libc/include/_ansi.h | 4 ---- newlib/libc/include/math.h | 13 +++++++------ newlib/libc/include/stdlib.h | 30 +++++++++++++++++++++++++----- 4 files changed, 51 insertions(+), 27 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d88da902f..2020fc8dd 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,17 +1,24 @@ +2014-10-10 Thomas Uhle + + * libc/include/_ansi.h: _LONG_LONG_TYPE definition removed. + * libc/include/math.h: _LONG_LONG_TYPE replaced by "long long". + Guards for C99 and C++11 functions fixed. + * libc/include/stdlib.h: Guards for C99 and C++11 functions fixed. + 2014-10-09 Sebastian Huber - * libc/include/stdint.h: Include . - (__STDINT_EXP): Delete. - (__have_long32): Likewise. - (__have_long64): Likewise. - (__have_longlong64): Likewise. - * libc/include/sys/_intsup.h: New file. - (__STDINT_EXP): Move from libc/include/stdint.h. - (__have_long32): Likewise. - (__have_long64): Likewise. - (__have_longlong64): Likewise. - * libc/include/inttypes.h: Include . - (__INTTYPES_EXP): Delete and use __STDINT_EXP() instead. + * libc/include/stdint.h: Include . + (__STDINT_EXP): Delete. + (__have_long32): Likewise. + (__have_long64): Likewise. + (__have_longlong64): Likewise. + * libc/include/sys/_intsup.h: New file. + (__STDINT_EXP): Move from libc/include/stdint.h. + (__have_long32): Likewise. + (__have_long64): Likewise. + (__have_longlong64): Likewise. + * libc/include/inttypes.h: Include . + (__INTTYPES_EXP): Delete and use __STDINT_EXP() instead. 2014-10-09 Freddie Chopin diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h index 7ac71e2dd..5fb990700 100644 --- a/newlib/libc/include/_ansi.h +++ b/newlib/libc/include/_ansi.h @@ -72,9 +72,6 @@ #ifndef _LONG_DOUBLE #define _LONG_DOUBLE long double #endif -#ifndef _LONG_LONG_TYPE -#define _LONG_LONG_TYPE long long -#endif #ifndef _PARAMS #define _PARAMS(paramlist) paramlist #endif @@ -93,7 +90,6 @@ #define _DEFUN_VOID(name) name() #define _CAST_VOID #define _LONG_DOUBLE double -#define _LONG_LONG_TYPE long #ifndef _PARAMS #define _PARAMS(paramlist) () #endif diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h index 2da05f1c8..6717cb3ee 100644 --- a/newlib/libc/include/math.h +++ b/newlib/libc/include/math.h @@ -136,7 +136,8 @@ extern double fmod _PARAMS((double, double)); #endif /* ! defined (__math_68881) */ #endif /* ! defined (_REENT_ONLY) */ -#if !defined(__STRICT_ANSI__) || defined(__cplusplus) || __STDC_VERSION__ >= 199901L +#if !defined(__STRICT_ANSI__) || defined(__cplusplus) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) /* ISO C99 types and macros. */ @@ -273,7 +274,7 @@ extern double scalbln _PARAMS((double, long int)); extern double tgamma _PARAMS((double)); extern double nearbyint _PARAMS((double)); extern long int lrint _PARAMS((double)); -extern _LONG_LONG_TYPE int llrint _PARAMS((double)); +extern long long int llrint _PARAMS((double)); extern double round _PARAMS((double)); extern long int lround _PARAMS((double)); extern long long int llround _PARAMS((double)); @@ -343,7 +344,7 @@ extern float scalblnf _PARAMS((float, long int)); extern float tgammaf _PARAMS((float)); extern float nearbyintf _PARAMS((float)); extern long int lrintf _PARAMS((float)); -extern _LONG_LONG_TYPE llrintf _PARAMS((float)); +extern long long int llrintf _PARAMS((float)); extern float roundf _PARAMS((float)); extern long int lroundf _PARAMS((float)); extern long long int llroundf _PARAMS((float)); @@ -432,7 +433,7 @@ extern long int lrintl _PARAMS((long double)); extern long long int llrintl _PARAMS((long double)); extern long double roundl _PARAMS((long double)); extern long lroundl _PARAMS((long double)); -extern _LONG_LONG_TYPE int llroundl _PARAMS((long double)); +extern long long int llroundl _PARAMS((long double)); extern long double truncl _PARAMS((long double)); extern long double remquol _PARAMS((long double, long double, int *)); extern long double fdiml _PARAMS((long double, long double)); @@ -452,11 +453,11 @@ extern long double erfcl _PARAMS((long double)); /* Other long double precision functions. */ extern _LONG_DOUBLE rintl _PARAMS((_LONG_DOUBLE)); extern long int lrintl _PARAMS((_LONG_DOUBLE)); -extern _LONG_LONG_TYPE llrintl _PARAMS((_LONG_DOUBLE)); +extern long long int llrintl _PARAMS((_LONG_DOUBLE)); #endif /* __i386__ */ #endif /* !_LDBL_EQ_DBL */ -#endif /* !defined (__STRICT_ANSI__) || defined(__cplusplus) || __STDC_VERSION__ >= 199901L */ +#endif /* !defined (__STRICT_ANSI__) || defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) */ #if !defined (__STRICT_ANSI__) || defined(__cplusplus) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index dee9ed613..9fc14fa3b 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -130,7 +130,9 @@ char * _EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_ _VOID _EXFUN(srand,(unsigned __seed)); double _EXFUN(strtod,(const char *__restrict __n, char **__restrict __end_PTR)); double _EXFUN(_strtod_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR)); -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L) +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) float _EXFUN(strtof,(const char *__restrict __n, char **__restrict __end_PTR)); #endif #ifndef __STRICT_ANSI__ @@ -151,7 +153,13 @@ long _EXFUN(a64l,(const char *__input)); char * _EXFUN(l64a,(long __input)); char * _EXFUN(_l64a_r,(struct _reent *,long __input)); int _EXFUN(on_exit,(_VOID (*__func)(int, _PTR),_PTR __arg)); +#endif /* ! __STRICT_ANSI__ */ +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) _VOID _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__))); +#endif +#ifndef __STRICT_ANSI__ int _EXFUN(putenv,(char *__string)); int _EXFUN(_putenv_r,(struct _reent *, char *__string)); _PTR _EXFUN(_reallocf_r,(struct _reent *, _PTR, size_t)); @@ -189,18 +197,28 @@ unsigned short * _EXFUN(_seed48_r,(struct _reent *, unsigned short [3])); _VOID _EXFUN(srand48,(long)); _VOID _EXFUN(_srand48_r,(struct _reent *, long)); +#endif /* ! __STRICT_ANSI__ */ +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) long long _EXFUN(atoll,(const char *__nptr)); +#endif +#ifndef __STRICT_ANSI__ long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr)); +#endif /* ! __STRICT_ANSI__ */ +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) 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) || (__cplusplus >= 201103L) long long _EXFUN(strtoll,(const char *__restrict __n, char **__restrict __end_PTR, int __base)); #endif #ifndef __STRICT_ANSI__ long long _EXFUN(_strtoll_r,(struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base)); #endif /* ! __STRICT_ANSI__ */ -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L) +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) unsigned long long _EXFUN(strtoull,(const char *__restrict __n, char **__restrict __end_PTR, int __base)); #endif #ifndef __STRICT_ANSI__ @@ -232,7 +250,9 @@ _VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *)) /* On platforms where long double equals double. */ #ifdef _HAVE_LONG_DOUBLE -#if !defined(__STRICT_ANSI__) || (__STDC_VERSION__ >= 199901L) || (__cplusplus >= 201103L) +#if !defined(__STRICT_ANSI__) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ + (defined(__cplusplus) && __cplusplus >= 201103L) extern long double strtold (const char *__restrict, char **__restrict); #endif #endif /* _HAVE_LONG_DOUBLE */ -- 2.43.5