Index: src/backend/utils/mmgr/mcxt.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/mmgr/mcxt.c,v
retrieving revision 1.47
diff -c -c -r1.47 mcxt.c
*** src/backend/utils/mmgr/mcxt.c	8 Aug 2004 06:44:32 -0000	1.47
--- src/backend/utils/mmgr/mcxt.c	29 Aug 2004 02:50:25 -0000
***************
*** 631,637 ****
  }
  
  
! #ifdef WIN32
  /*
   *	Memory support routines for libpgport on Win32
   *
--- 631,637 ----
  }
  
  
! #if defined(WIN32) || defined(__CYGWIN__)
  /*
   *	Memory support routines for libpgport on Win32
   *
***************
*** 649,654 ****
--- 649,655 ----
  	return palloc(sz);
  }
  
+ 
  char *
  pgport_pstrdup(const char *str)
  {
Index: src/port/dirmod.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/port/dirmod.c,v
retrieving revision 1.19
diff -c -c -r1.19 dirmod.c
*** src/port/dirmod.c	29 Aug 2004 01:44:02 -0000	1.19
--- src/port/dirmod.c	29 Aug 2004 02:50:28 -0000
***************
*** 31,48 ****
  
  #if defined(WIN32) || defined(__CYGWIN__)
  
- 
  #include "miscadmin.h"
- #include <winioctl.h>
  
  #undef rename
  #undef unlink
  
  #ifndef FRONTEND
  /*
   *	Call non-macro versions of palloc, can't reference CurrentMemoryContext
   *	because of DLLIMPORT.
   */
  #define palloc(sz)		pgport_palloc(sz)
  #define pstrdup(str)	pgport_pstrdup(str)
  #define pfree(pointer)	pgport_pfree(pointer)
--- 31,57 ----
  
  #if defined(WIN32) || defined(__CYGWIN__)
  
  #include "miscadmin.h"
  
  #undef rename
  #undef unlink
  
+ #ifdef __WIN32__
+ #include <winioctl.h>
+ #else
+ /* __CYGWIN__ */
+ #include <windows.h>
+ #include <w32api/winioctl.h>
+ #endif
+ 
  #ifndef FRONTEND
  /*
   *	Call non-macro versions of palloc, can't reference CurrentMemoryContext
   *	because of DLLIMPORT.
   */
+ #undef palloc
+ #undef pstrdup
+ #undef pfree
  #define palloc(sz)		pgport_palloc(sz)
  #define pstrdup(str)	pgport_pstrdup(str)
  #define pfree(pointer)	pgport_pfree(pointer)