Commit e2e1a0cc authored by Bruce Momjian's avatar Bruce Momjian

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

parent 3036b84b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me. * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
* *
* IDENTIFICATION * 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 @@ ...@@ -21,6 +21,12 @@
#include "postgres_fe.h" #include "postgres_fe.h"
#endif #endif
/* Don't modify declarations in system headers */
#if defined(WIN32) || defined(__CYGWIN__)
#undef rename
#undef unlink
#endif
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
...@@ -33,9 +39,6 @@ ...@@ -33,9 +39,6 @@
#include "miscadmin.h" #include "miscadmin.h"
#undef rename
#undef unlink
#ifndef __CYGWIN__ #ifndef __CYGWIN__
#include <winioctl.h> #include <winioctl.h>
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment