Index: src/port/dirmod.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/port/dirmod.c,v
retrieving revision 1.24
diff -c -c -r1.24 dirmod.c
*** src/port/dirmod.c	10 Sep 2004 02:49:37 -0000	1.24
--- src/port/dirmod.c	10 Sep 2004 09:51:12 -0000
***************
*** 21,26 ****
--- 21,32 ----
  #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,41 ****
  
  #include "miscadmin.h"
  
- #undef rename
- #undef unlink
- 
  #ifndef __CYGWIN__
  #include <winioctl.h>
  #else
--- 39,44 ----