Commit0476bbb

committed

Several Cygwin fixes pointed out by Reini Urban.

1 parentf94aea9 commit0476bbbCopy full SHA for 0476bbb

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 3 additions & 2 deletions

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`		`-#ifdefWIN32`
	`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`	`returnpalloc(sz);`
`650`	`650`	`}`
`651`	`651`
	`652`	`+`
`652`	`653`	`char*`
`653`	`654`	`pgport_pstrdup(constchar*str)`
`654`	`655`	`{`

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*Win32 (NT, Win2k, XP).replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.19 2004/08/2901:44:02 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.20 2004/08/2902:58:50 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -31,18 +31,27 @@`
`31`	`31`
`32`	`32`	`#if defined(WIN32)\|\| defined(__CYGWIN__)`
`33`	`33`
`34`		`-`
`35`	`34`	`#include"miscadmin.h"`
`36`		`-#include<winioctl.h>`
`37`	`35`
`38`	`36`	`#undef rename`
`39`	`37`	`#undef unlink`
`40`	`38`
	`39`	`+#ifdef__WIN32__`
	`40`	`+#include<winioctl.h>`
	`41`	`+#else`
	`42`	`+/* __CYGWIN__ */`
	`43`	`+#include<windows.h>`
	`44`	`+#include<w32api/winioctl.h>`
	`45`	`+#endif`
	`46`	`+`
`41`	`47`	`#ifndefFRONTEND`
`42`	`48`	`/*`
`43`	`49`	`*Call non-macro versions of palloc, can't reference CurrentMemoryContext`
`44`	`50`	`*because of DLLIMPORT.`
`45`	`51`	`*/`
	`52`	`+#undef palloc`
	`53`	`+#undef pstrdup`
	`54`	`+#undef pfree`
`46`	`55`	`#definepalloc(sz)pgport_palloc(sz)`
`47`	`56`	`#definepstrdup(str)pgport_pstrdup(str)`
`48`	`57`	`#definepfree(pointer)pgport_pfree(pointer)`

Comments

(0)