From a17dbec893b6b7b419c61e5e6f3f325537dab0b8 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 3 Sep 2005 15:55:00 +0000
Subject: [PATCH] libpgport routines need nonstandard palloc to work on
 Windows. Propagate hack that's in dirmod.c to copydir.c.

---
 src/port/copydir.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/port/copydir.c b/src/port/copydir.c
index 4820917cda..a5cd967ed7 100644
--- a/src/port/copydir.c
+++ b/src/port/copydir.c
@@ -11,7 +11,7 @@
  *	as a service.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/copydir.c,v 1.13 2005/09/02 18:55:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/copydir.c,v 1.14 2005/09/03 15:55:00 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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);
 
-- 
2.40.0