diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:49:12 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:49:12 +0100 |
| commit | 286fcca6d0795c1524ba7772358623d86994f4ff (patch) | |
| tree | 15dd120e28d9863cc0c586bb4b9d3c6417ad5a04 | |
| parent | 472137e23297f72a1710718ff86d961e5c310720 (diff) | |
| download | px4-firmware-286fcca6d0795c1524ba7772358623d86994f4ff.tar.gz px4-firmware-286fcca6d0795c1524ba7772358623d86994f4ff.tar.bz2 px4-firmware-286fcca6d0795c1524ba7772358623d86994f4ff.zip | |
Fix up math.h for GCC 4.9
| -rw-r--r-- | nuttx-patches/math.h.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx-patches/math.h.patch b/nuttx-patches/math.h.patch index e09120f9c..18650027e 100644 --- a/nuttx-patches/math.h.patch +++ b/nuttx-patches/math.h.patch @@ -230,7 +230,7 @@ diff -ruN NuttX/nuttx/arch/arm/include/math.h NuttX/nuttx/arch/arm/include/math. +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)); @@ -297,7 +297,7 @@ diff -ruN NuttX/nuttx/arch/arm/include/math.h NuttX/nuttx/arch/arm/include/math. +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 llrintf _PARAMS((float)); +extern float roundf _PARAMS((float)); +extern long int lroundf _PARAMS((float)); +extern long long int llroundf _PARAMS((float)); @@ -387,7 +387,7 @@ diff -ruN NuttX/nuttx/arch/arm/include/math.h NuttX/nuttx/arch/arm/include/math. +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)); @@ -407,7 +407,7 @@ diff -ruN NuttX/nuttx/arch/arm/include/math.h NuttX/nuttx/arch/arm/include/math. +/* 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 llrintl _PARAMS((_LONG_DOUBLE)); +#endif /* __i386__ */ +#endif /* !_LDBL_EQ_DBL */ + |