From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 10 Sep 2004 09:53:08 +0000 (+0000)
Subject: Move undef of rename/unlink so system declarations are unmodified.
X-Git-Tag: REL8_0_0BETA3~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e1a0cc710dd89ba23fd989243864d62cf08d72;p=postgresql

Move undef of rename/unlink so system declarations are unmodified.
---

diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 89d2d39a26..f2913b9f91 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -10,7 +10,7 @@
  *	Win32 (NT, Win2k, XP).	replace() doesn't work on Win95/98/Me.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.24 2004/09/10 02:49:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/dirmod.c,v 1.25 2004/09/10 09:53:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,12 @@
 #include "postgres_fe.h"
 #endif
 
+/* Don't modify declarations in system headers */
+#if defined(WIN32) || defined(__CYGWIN__)
+#undef rename
+#undef unlink
+#endif
+
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
@@ -33,9 +39,6 @@
 
 #include "miscadmin.h"
 
-#undef rename
-#undef unlink
-
 #ifndef __CYGWIN__
 #include <winioctl.h>
 #else