Commit6d8c3d4

committed

Add popen/pclose -> _popen/_pclose() mapping for Win32.

1 parent5bd06b2 commit6d8c3d4Copy full SHA for 6d8c3d4

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,9 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.50 2002/10/24 01:33:50 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.51 2002/10/29 19:35:33 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`		`-`
`10`	`9`	`#include"common.h"`
`11`	`10`
`12`	`11`	`#include<errno.h>`
`@@ -27,9 +26,6 @@`
`27`	`26`
`28`	`27`	`#ifndefWIN32`
`29`	`28`	`#include<sys/ioctl.h>/* for ioctl() */`
`30`		`-#else`
`31`		`-#definepopen(x,y) _popen(x,y)`
`32`		`-#definepclose(x) _pclose(x)`
`33`	`29`	`#endif`
`34`	`30`
`35`	`31`	`#ifdefHAVE_TERMIOS_H`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.20 2002/10/23 19:23:56 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.21 2002/10/29 19:35:33 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefCOMMON_H`
`9`	`9`	`#defineCOMMON_H`
`@@ -42,4 +42,10 @@ extern FILE *PageOutput(int lines, bool pager);`
`42`	`42`	`/* sprompt.h */`
`43`	`43`	`externcharsimple_prompt(constcharprompt,intmaxlen,boolecho);`
`44`	`44`
	`45`	`+/* Used for all Win32 popen/pclose calls */`
	`46`	`+#ifdefWIN32`
	`47`	`+#definepopen(x,y) _popen(x,y)`
	`48`	`+#definepclose(x) _pclose(x)`
	`49`	`+#endif`
	`50`	`+`
`45`	`51`	`#endif/* COMMON_H */`

Comments

(0)