libpgport routines need nonstandard palloc to work on Windows.

Propagate hack that's in dirmod.c to copydir.c.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/port/copydir.c b/src/port/copydir.c
index cc54be216b..7e38de9fe6 100644
--- a/src/port/copydir.c
+++ b/src/port/copydir.c
@@ -24,6 +24,17 @@
 
 #include "storage/fd.h"
 
+/*
+ *	On Windows, call non-macro versions of palloc; we can't reference
+ *	CurrentMemoryContext in this file because of DLLIMPORT conflict.
+ */
+#if defined(WIN32) || defined(__CYGWIN__)
+#undef palloc
+#undef pstrdup
+#define palloc(sz)		pgport_palloc(sz)
+#define pstrdup(str)	pgport_pstrdup(str)
+#endif
+
 
 static void copy_file(char *fromfile, char *tofile);