diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-08-29 02:58:50 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-08-29 02:58:50 +0000 |
| commit | 0476bbbc9be45358c6e8e5449555adf4d7fe33d3 (patch) | |
| tree | cd94d189a908da01f352b5f5595934b2cb404a98 /src/port/dirmod.c | |
| parent | f94aea9c10f43cc3ccf99df2e1e80c89a36d683e (diff) | |
| download | postgresql-0476bbbc9be45358c6e8e5449555adf4d7fe33d3.tar.gz postgresql-0476bbbc9be45358c6e8e5449555adf4d7fe33d3.zip | |
Several Cygwin fixes pointed out by Reini Urban.
Diffstat (limited to 'src/port/dirmod.c')
| -rw-r--r-- | src/port/dirmod.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/port/dirmod.c b/src/port/dirmod.c index 1c9ad19c0c5..ba01a3d7fe6 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.19 2004/08/29 01:44:02 momjian Exp $ + * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.20 2004/08/29 02:58:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,18 +31,27 @@ #if defined(WIN32) || defined(__CYGWIN__) - #include "miscadmin.h" -#include <winioctl.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) |