Import of OpenSSH 4.3p1

[gssapi-openssh.git] / openssh / progressmeter.c

diff --git a/openssh/progressmeter.c b/openssh/progressmeter.c
index 3cda090616f15fd22524ee668d5e57b6a23ccf00..13c51d87ef703dd0d1afeb11618d699b4680672a 100644 (file)
--- a/openssh/progressmeter.c
+++ b/openssh/progressmeter.c
@@ -85,8 +85,8 @@ format_rate(char *buf, int size, off_t bytes)
                bytes = (bytes + 512) / 1024;
        }
        snprintf(buf, size, "%3lld.%1lld%c%s",
-           (int64_t) (bytes + 5) / 100,
-           (int64_t) (bytes + 5) / 10 % 10,
+           (long long) (bytes + 5) / 100,
+           (long long) (bytes + 5) / 10 % 10,
            unit[i],
            i ? "B" : " ");
 }
@@ -99,7 +99,7 @@ format_size(char *buf, int size, off_t bytes)
        for (i = 0; bytes >= 10000 && unit[i] != 'T'; i++)
                bytes = (bytes + 512) / 1024;
        snprintf(buf, size, "%4lld%c%s",
-           (int64_t) bytes,
+           (long long) bytes,
            unit[i],
            i ? "B" : " ");
 }