Merge pull request #127 from peter-kutak/peter-kutak-patch-1

Rename round function to avoid conflict
bareos · Oct 30, 2018 · 25d6a98 · 25d6a98
1 parent 40a50c3
commit 25d6a98
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/lib/bsnprintf.cc b/core/src/lib/bsnprintf.cc
@@ -618,7 +618,7 @@ static LDOUBLE pow10(int exp)
    return result;
 }
 
-static int64_t round(LDOUBLE value)
+static int64_t roundtoint(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 = roundtoint((pow10(max)) * (ufvalue - intpart));
 
    if (fracpart >= pow10(max)) {
       intpart++;