From 287188ea072dd887a17dd56360531c3a22307e7c Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Tue, 8 Nov 2011 10:31:04 +0000 Subject: [PATCH] re PR libfortran/47970 (c99_functions.c:611:5: warning: implicit declaration of function 'round') PR libfortran/47970 * intrinsics/c99_functions.c (round): Move higher in the file. From-SVN: r181153 --- libgfortran/ChangeLog | 5 +++ libgfortran/intrinsics/c99_functions.c | 61 +++++++++++++++++----------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 82538422db4..becb6012838 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2011-11-08 Francois-Xavier Coudert + + PR libfortran/47970 + * intrinsics/c99_functions.c (round): Move higher in the file. + 2011-11-07 Janne Blomqvist PR libfortran/45723 diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c index 9ba5544a02b..a95f09ac01d 100644 --- a/libgfortran/intrinsics/c99_functions.c +++ b/libgfortran/intrinsics/c99_functions.c @@ -559,6 +559,37 @@ powf (float x, float y) #endif +#ifndef HAVE_ROUND +#define HAVE_ROUND 1 +/* Round to nearest integral value. If the argument is halfway between two + integral values then round away from zero. */ +double round (double x); + +double +round (double x) +{ + double t; + if (!isfinite (x)) + return (x); + + if (x >= 0.0) + { + t = floor (x); + if (t - x <= -0.5) + t += 1.0; + return (t); + } + else + { + t = floor (-x); + if (t + x <= -0.5) + t += 1.0; + return (-t); + } +} +#endif + + /* Algorithm by Steven G. Kargl. */ #if !defined(HAVE_ROUNDL) @@ -614,36 +645,6 @@ roundl (long double x) #endif #endif -#ifndef HAVE_ROUND -#define HAVE_ROUND 1 -/* Round to nearest integral value. If the argument is halfway between two - integral values then round away from zero. */ -double round (double x); - -double -round (double x) -{ - double t; - if (!isfinite (x)) - return (x); - - if (x >= 0.0) - { - t = floor (x); - if (t - x <= -0.5) - t += 1.0; - return (t); - } - else - { - t = floor (-x); - if (t + x <= -0.5) - t += 1.0; - return (-t); - } -} -#endif - #ifndef HAVE_ROUNDF #define HAVE_ROUNDF 1 /* Round to nearest integral value. If the argument is halfway between two -- 2.11.4.GIT