Commit26fc9b6

committed

Move io.h include higher in the file so it doesn't conflict with

rename/unlink defined later. Problem exists on MS VC.Andrew Francis

1 parent6a5718b commit26fc9b6Copy full SHA for 26fc9b6

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 15 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,28 +8,36 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-lobj.c,v 1.48 2004/03/05 01:53:59 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-lobj.c,v 1.49 2004/08/17 02:44:13 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`15`		`-#include"postgres_fe.h"`
`16`	`15`
`17`		`-#include<fcntl.h>`
`18`		`-#include<sys/stat.h>`
`19`		`-#include<errno.h>`
	`16`	`+#ifdefWIN32`
	`17`	`+/*`
	`18`	`+ *As unlink/rename are #define'd in port.h (via postgres_fe.h), io.h`
	`19`	`+ *must be included first on MS C. Might as well do it for all WIN32's`
	`20`	`+ *here.`
	`21`	`+ */`
	`22`	`+#include<io.h>`
	`23`	`+#endif`
	`24`	`+`
	`25`	`+#include"postgres_fe.h"`
`20`	`26`
`21`	`27`	`#ifdefWIN32`
`22`	`28`	`#include"win32.h"`
`23`		`-#include"io.h"`
`24`	`29`	`#else`
`25`	`30`	`#include<unistd.h>`
`26`	`31`	`#endif`
`27`	`32`
	`33`	`+#include<fcntl.h>`
	`34`	`+#include<sys/stat.h>`
	`35`	`+#include<errno.h>`
	`36`	`+`
`28`	`37`	`#include"libpq-fe.h"`
`29`	`38`	`#include"libpq-int.h"`
`30`	`39`	`#include"libpq/libpq-fs.h"/* must come after sys/stat.h */`
`31`	`40`
`32`		`-`
`33`	`41`	`#defineLO_BUFSIZE 8192`
`34`	`42`
`35`	`43`	`staticintlo_initialize(PGconn*conn);`

Comments

(0)