diff -ru rsync-3.0.6/proto.h rsync-3.0.6~~/proto.h
--- rsync-3.0.6/proto.h	2009-05-08 19:43:22.000000000 +0200
+++ rsync-3.0.6~~/proto.h	2009-06-01 16:10:51.817945000 +0200
@@ -306,7 +306,7 @@
 int do_rename(const char *fname1, const char *fname2);
 void trim_trailing_slashes(char *name);
 int do_mkdir(char *fname, mode_t mode);
-int do_mkstemp(char *template, mode_t perms);
+int do_mkstemp(char *tmpl, mode_t perms);
 int do_stat(const char *fname, STRUCT_STAT *st);
 int do_lstat(const char *fname, STRUCT_STAT *st);
 int do_fstat(int fd, STRUCT_STAT *st);
diff -ru rsync-3.0.6/syscall.c rsync-3.0.6~~/syscall.c
--- rsync-3.0.6/syscall.c	2009-01-17 22:41:35.000000000 +0100
+++ rsync-3.0.6~~/syscall.c	2009-06-01 16:11:20.427503100 +0200
@@ -208,7 +208,7 @@
 }
 
 /* like mkstemp but forces permissions */
-int do_mkstemp(char *template, mode_t perms)
+int do_mkstemp(char *tmpl, mode_t perms)
 {
 	RETURN_ERROR_IF(dry_run, 0);
 	RETURN_ERROR_IF(read_only, EROFS);
@@ -216,13 +216,13 @@
 
 #if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
 	{
-		int fd = mkstemp(template);
+		int fd = mkstemp(tmpl);
 		if (fd == -1)
 			return -1;
 		if (fchmod(fd, perms) != 0 && preserve_perms) {
 			int errno_save = errno;
 			close(fd);
-			unlink(template);
+			unlink(tmpl);
 			errno = errno_save;
 			return -1;
 		}
@@ -232,9 +232,9 @@
 		return fd;
 	}
 #else
-	if (!mktemp(template))
+	if (!mktemp(tmpl))
 		return -1;
-	return do_open(template, O_RDWR|O_EXCL|O_CREAT, perms);
+	return do_open(tmpl, O_RDWR|O_EXCL|O_CREAT, perms);
 #endif
 }