From fe4ba087da02fb06b41e936626521f0fd77434e3 Mon Sep 17 00:00:00 2001 From: schnetter Date: Tue, 28 Dec 2004 18:55:00 +0000 Subject: Rename "round" to "myround". Otherwise, the function "round" has the same name as the one from (which is #included) but has a different return type, which is an error for gcc 4.0. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3944 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/util/snprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/util/snprintf.c') diff --git a/src/util/snprintf.c b/src/util/snprintf.c index 561dced0..61390c9c 100644 --- a/src/util/snprintf.c +++ b/src/util/snprintf.c @@ -586,7 +586,7 @@ static LDOUBLE pow10 (int exp) return result; } -static long round (LDOUBLE value) +static long myround (LDOUBLE value) { long intpart; @@ -680,7 +680,7 @@ static int fmtfp (char *buffer, size_t *currlen, size_t maxlen, /* We "cheat" by converting the fractional part to integer by * multiplying by a factor of 10 */ - fracpart = round ((pow10 (max)) * (ufvalue - intpart)); + fracpart = myround ((pow10 (max)) * (ufvalue - intpart)); if (fracpart >= pow10 (max)) { -- cgit v1.2.3