Commita17dbec

committed

libpgport routines need nonstandard palloc to work on Windows.

Propagate hack that's in dirmod.c to copydir.c.

1 parentb72fe49 commita17dbecCopy full SHA for a17dbec

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*as a service.`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/port/copydir.c,v 1.13 2005/09/02 18:55:32 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/port/copydir.c,v 1.14 2005/09/03 15:55:00 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -24,6 +24,17 @@`
`24`	`24`
`25`	`25`	`#include"storage/fd.h"`
`26`	`26`
	`27`	`+/*`
	`28`	`+ *On Windows, call non-macro versions of palloc; we can't reference`
	`29`	`+ *CurrentMemoryContext in this file because of DLLIMPORT conflict.`
	`30`	`+ */`
	`31`	`+#if defined(WIN32)\|\| defined(__CYGWIN__)`
	`32`	`+#undef palloc`
	`33`	`+#undef pstrdup`
	`34`	`+#definepalloc(sz)pgport_palloc(sz)`
	`35`	`+#definepstrdup(str)pgport_pstrdup(str)`
	`36`	`+#endif`
	`37`	`+`
`27`	`38`
`28`	`39`	`staticvoidcopy_file(charfromfile,chartofile);`
`29`	`40`

Comments

(0)