Commite2e1a0c

committed

Move undef of rename/unlink so system declarations are unmodified.

1 parent3036b84 commite2e1a0cCopy full SHA for e2e1a0c

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 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.24 2004/09/1002:49:37 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.25 2004/09/1009:53:08 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -21,6 +21,12 @@`
`21`	`21`	`#include"postgres_fe.h"`
`22`	`22`	`#endif`
`23`	`23`
	`24`	`+/* Don't modify declarations in system headers */`
	`25`	`+#if defined(WIN32)\|\| defined(__CYGWIN__)`
	`26`	`+#undef rename`
	`27`	`+#undef unlink`
	`28`	`+#endif`
	`29`	`+`
`24`	`30`	`#include<unistd.h>`
`25`	`31`	`#include<dirent.h>`
`26`	`32`	`#include<sys/stat.h>`
`@@ -33,9 +39,6 @@`
`33`	`39`
`34`	`40`	`#include"miscadmin.h"`
`35`	`41`
`36`		`-#undef rename`
`37`		`-#undef unlink`
`38`		`-`
`39`	`42`	`#ifndef__CYGWIN__`
`40`	`43`	`#include<winioctl.h>`
`41`	`44`	`#else`

Comments

(0)