--- config.h.in	16 Jul 2004 20:04:33 -0000	1.91
+++ config.h.in	30 Jul 2004 20:23:58 -0000
@@ -158,6 +158,9 @@
 /* Define to 1 if you have the `mknod' function. */
 #undef HAVE_MKNOD
 
+/* Define to 1 if you have the `mkstemp64' function. */
+#undef HAVE_MKSTEMP64
+
 /* Define to 1 if you have the `mtrace' function. */
 #undef HAVE_MTRACE
 
@@ -170,6 +173,9 @@
 /* */
 #undef HAVE_OFF64_T
 
+/* Define to 1 if you have the `open64' function. */
+#undef HAVE_OPEN64
+
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK
 
--- configure	16 Jul 2004 20:04:20 -0000	1.189
+++ configure	30 Jul 2004 20:24:00 -0000
@@ -9332,10 +9332,13 @@ fi
 
 
 
+
+
 for ac_func in waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo \
     fchmod fstat strchr readlink link utime utimes strftime mtrace ftruncate \
     memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk \
-    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid
+    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
+    open64 mkstemp64
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
--- configure.in	16 Jul 2004 20:04:20 -0000	1.197
+++ configure.in	30 Jul 2004 20:24:00 -0000
@@ -444,7 +444,8 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo \
     fchmod fstat strchr readlink link utime utimes strftime mtrace ftruncate \
     memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk \
-    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid)
+    strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
+    open64 mkstemp64)
 
 AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
 AC_TRY_RUN([
--- syscall.c	18 Feb 2004 22:33:21 -0000	1.30
+++ syscall.c	30 Jul 2004 20:24:00 -0000
@@ -152,7 +152,7 @@ int do_mkstemp(char *template, mode_t pe
 	RETURN_ERROR_IF(dry_run, 0);
 	RETURN_ERROR_IF(read_only, EROFS);
 
-#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
+#if HAVE_SECURE_MKSTEMP && HAVE_FCHMOD && (!HAVE_OPEN64 || HAVE_MKSTEMP64)
 	{
 		int fd = mkstemp(template);
 		if (fd == -1)