Several Cygwin fixes pointed out by Reini Urban.

bmomjian · bmomjian · commit 0476bbbc9be4 · 2004-08-29T02:58:50.000Z
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.47 2004/08/08 06:44:32 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.48 2004/08/29 02:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -631,7 +631,7 @@ MemoryContextStrdup(MemoryContext context, const char *string)
 }
 
 
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
 /*
  *	Memory support routines for libpgport on Win32
  *
@@ -649,6 +649,7 @@ pgport_palloc(Size sz)
 	return palloc(sz);
 }
 
+
 char *
 pgport_pstrdup(const char *str)
 {
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.47 2004/08/08 06:44:32 momjian Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.48 2004/08/29 02:58:50 momjian Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -631,7 +631,7 @@ MemoryContextStrdup(MemoryContext context, const char *string)`
`631`	`631`	`}`
`632`	`632`
`633`	`633`
`634`		`-#ifdef WIN32`
	`634`	`+#if defined(WIN32) \|\| defined(__CYGWIN__)`
`635`	`635`	`/*`
`636`	`636`	`* Memory support routines for libpgport on Win32`
`637`	`637`	`*`
`@@ -649,6 +649,7 @@ pgport_palloc(Size sz)`
`649`	`649`	`return palloc(sz);`
`650`	`650`	`}`
`651`	`651`
	`652`	`+`
`652`	`653`	`char *`
`653`	`654`	`pgport_pstrdup(const char *str)`
`654`	`655`	`{`