diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-10-10 14:43:19 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-10-10 14:43:19 +0000 |
| commit | 7a84e9c4bcf9d38a7400bf797e5a4ec8d200b916 (patch) | |
| tree | 5b6ac31d62515cdf1b01e7226cbb6a174c54f6dc /newlib/libc/include/math.h | |
| parent | f49469bb1efd493811e7d475daa89743623ce424 (diff) | |
| download | cygnal-7a84e9c4bcf9d38a7400bf797e5a4ec8d200b916.tar.gz cygnal-7a84e9c4bcf9d38a7400bf797e5a4ec8d200b916.tar.bz2 cygnal-7a84e9c4bcf9d38a7400bf797e5a4ec8d200b916.zip | |
* 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.
Diffstat (limited to 'newlib/libc/include/math.h')
| -rw-r--r-- | newlib/libc/include/math.h | 13 |
1 files changed, 7 insertions, 6 deletions
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) |