From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 1 Mar 2019 12:10:46 +0000 (+0100)
Subject: Change round() to bround() to avoid library definition conflict
X-Git-Tag: Release-9.4.3~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356330bd843be2ee51f948b3fb7179d2167518b8;p=thirdparty%2Fbacula.git

Change round() to bround() to avoid library definition conflict
---

diff --git a/bacula/src/lib/bsnprintf.c b/bacula/src/lib/bsnprintf.c
index 09be60da4..80815f1c9 100644
--- a/bacula/src/lib/bsnprintf.c
+++ b/bacula/src/lib/bsnprintf.c
@@ -1,7 +1,7 @@
 /*
    Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2016 Kern Sibbald
+   Copyright (C) 2000-2019 Kern Sibbald
 
    The original author of Bacula is Kern Sibbald, with contributions
    from many others, a complete list can be found in the file AUTHORS.
@@ -619,7 +619,7 @@ static LDOUBLE pow10(int exp)
    return result;
 }
 
-static int64_t round(LDOUBLE value)
+static int64_t bround(LDOUBLE value)
 {
    int64_t intpart;
 
@@ -685,7 +685,7 @@ static int32_t fmtfp(char *buffer, int32_t currlen, int32_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 = bround((pow10(max)) * (ufvalue - intpart));
 
    if (fracpart >= pow10(max)) {
       intpart++;