From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 24 Apr 2011 00:27:57 +0000 (-0400)
Subject: In pg_upgrade, only compile copy_file() on non-Win32 systems.
X-Git-Tag: REL9_1_BETA1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6322b31918c5c57eeea80c26a088af44d573095;p=postgresql

In pg_upgrade, only compile copy_file() on non-Win32 systems.

Per report from Andrew Dunstan.
---

diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index f8f7233593..0552541c24 100644
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -12,9 +12,10 @@
 #include <fcntl.h>
 
 
-static int	copy_file(const char *fromfile, const char *tofile, bool force);
 
-#ifdef WIN32
+#ifndef WIN32
+static int	copy_file(const char *fromfile, const char *tofile, bool force);
+#else
 static int	win32_pghardlink(const char *src, const char *dst);
 #endif
 
@@ -126,6 +127,7 @@ linkAndUpdateFile(pageCnvCtx *pageConverter,
 }
 
 
+#ifndef WIN32
 static int
 copy_file(const char *srcfile, const char *dstfile, bool force)
 {
@@ -220,6 +222,7 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
 
 	return 1;
 }
+#endif
 
 
 /*