Merge changes from 3.14.12.5 (revno 12582)

2015-03-25 12:53:13 -05:00
parent 490540b005 0a1cf17681
commit ffcbd4ca8b
5 changed files with 28 additions and 9 deletions
@@ -85,7 +85,8 @@ static void sprint_long (char *ret, dbr_long_t val, IntFormatT outType)
            "0x%lX" /* hex */
        };

-        sprintf(ret, fmt[outType], val);
+        /* Formats have long modifier, pass value as a long */
+        sprintf(ret, fmt[outType], (long) val);
    }
 }