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

bmomjian · bmomjian · commit f6322b31918c · 2011-04-23T20:28:29.000-04:00
Per report from Andrew Dunstan.
diff --git 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
 
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@`
`12`	`12`	`#include <fcntl.h>`
`13`	`13`
`14`	`14`
`15`		`-static int copy_file(const char fromfile, const char tofile, bool force);`
`16`	`15`
`17`		`-#ifdef WIN32`
	`16`	`+#ifndef WIN32`
	`17`	`+static int copy_file(const char fromfile, const char tofile, bool force);`
	`18`	`+#else`
`18`	`19`	`static int win32_pghardlink(const char src, const char dst);`
`19`	`20`	`#endif`
`20`	`21`
`@@ -126,6 +127,7 @@ linkAndUpdateFile(pageCnvCtx *pageConverter,`
`126`	`127`	`}`
`127`	`128`
`128`	`129`
	`130`	`+#ifndef WIN32`
`129`	`131`	`static int`
`130`	`132`	`copy_file(const char srcfile, const char dstfile, bool force)`
`131`	`133`	`{`
`@@ -220,6 +222,7 @@ copy_file(const char srcfile, const char dstfile, bool force)`
`220`	`222`
`221`	`223`	`return 1;`
`222`	`224`	`}`
	`225`	`+#endif`
`223`	`226`
`224`	`227`
`225`	`228`	`/*`