Index: hostfile.c
===================================================================
RCS file: /cvs/openssh/hostfile.c,v
retrieving revision 1.32
diff -u -r1.32 hostfile.c
--- hostfile.c	2 Aug 2005 07:07:08 -0000	1.32
+++ hostfile.c	21 Nov 2005 20:53:09 -0000
@@ -88,8 +88,8 @@
 		return (-1);
 	}
 	if (ret != SHA_DIGEST_LENGTH) {
-		debug2("extract_salt: expected salt len %u, got %u",
-		    salt_len, ret);
+		debug2("extract_salt: expected salt len %d, got %d",
+		    SHA_DIGEST_LENGTH, ret);
 		return (-1);
 	}
 
Index: loginrec.c
===================================================================
RCS file: /cvs/openssh/loginrec.c,v
retrieving revision 1.70
diff -u -r1.70 loginrec.c
--- loginrec.c	17 Jul 2005 07:26:44 -0000	1.70
+++ loginrec.c	21 Nov 2005 20:53:10 -0000
@@ -1589,7 +1589,7 @@
 		return (0);
 	default:
 		error("%s: Error reading from %s: Expecting %d, got %d",
-		    __func__, LASTLOG_FILE, sizeof(last), ret);
+		    __func__, LASTLOG_FILE, (int)sizeof(last), ret);
 		return (0);
 	}
 
@@ -1613,7 +1613,7 @@
 	int fd;
 	struct utmp ut;
 	struct sockaddr_storage from;
-	size_t fromlen = sizeof(from);
+	socklen_t fromlen = sizeof(from);
 	struct sockaddr_in *a4;
 	struct sockaddr_in6 *a6;
 	time_t t;
Index: progressmeter.c
===================================================================
RCS file: /cvs/openssh/progressmeter.c,v
retrieving revision 1.24
diff -u -r1.24 progressmeter.c
--- progressmeter.c	16 Jun 2005 03:18:05 -0000	1.24
+++ progressmeter.c	21 Nov 2005 20:53:10 -0000
@@ -85,8 +85,8 @@
 		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 @@
 	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" : " ");
 }
Index: scp.c
===================================================================
RCS file: /cvs/openssh/scp.c,v
retrieving revision 1.139
diff -u -r1.139 scp.c
--- scp.c	3 Oct 2005 08:11:25 -0000	1.139
+++ scp.c	21 Nov 2005 20:53:10 -0000
@@ -563,7 +563,7 @@
 #define	FILEMODEMASK	(S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
 		snprintf(buf, sizeof buf, "C%04o %lld %s\n",
 		    (u_int) (stb.st_mode & FILEMODEMASK),
-		    (int64_t)stb.st_size, last);
+		    (long long)stb.st_size, last);
 		if (verbose_mode) {
 			fprintf(stderr, "Sending file modes: %s", buf);
 		}
Index: sftp-server.c
===================================================================
RCS file: /cvs/openssh/sftp-server.c,v
retrieving revision 1.58
diff -u -r1.58 sftp-server.c
--- sftp-server.c	3 Oct 2005 08:11:25 -0000	1.58
+++ sftp-server.c	21 Nov 2005 20:53:11 -0000
@@ -428,7 +428,7 @@
 	len = get_int();
 
 	TRACE("read id %u handle %d off %llu len %d", id, handle,
-	    (u_int64_t)off, len);
+	    (long long)off, len);
 	if (len > sizeof buf) {
 		len = sizeof buf;
 		logit("read change len %d", len);
@@ -469,7 +469,7 @@
 	data = get_string(&len);
 
 	TRACE("write id %u handle %d off %llu len %d", id, handle,
-	    (u_int64_t)off, len);
+	    (long long)off, len);
 	fd = handle_to_fd(handle);
 	if (fd >= 0) {
 		if (lseek(fd, off, SEEK_SET) < 0) {