diff options
| -rw-r--r-- | src/bin/psql/common.c | 6 | ||||
| -rw-r--r-- | src/bin/psql/common.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index f67c9a64443..55af65a3ae1 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,10 +3,9 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.50 2002/10/24 01:33:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.51 2002/10/29 19:35:33 momjian Exp $ */ #include "postgres_fe.h" - #include "common.h" #include <errno.h> @@ -27,9 +26,6 @@ #ifndef WIN32 #include <sys/ioctl.h> /* for ioctl() */ -#else -#define popen(x,y) _popen(x,y) -#define pclose(x) _pclose(x) #endif #ifdef HAVE_TERMIOS_H diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h index 29af2f648e9..3b0c7d8b563 100644 --- a/src/bin/psql/common.h +++ b/src/bin/psql/common.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.20 2002/10/23 19:23:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.21 2002/10/29 19:35:33 momjian Exp $ */ #ifndef COMMON_H #define COMMON_H @@ -42,4 +42,10 @@ extern FILE *PageOutput(int lines, bool pager); /* sprompt.h */ extern char *simple_prompt(const char *prompt, int maxlen, bool echo); +/* Used for all Win32 popen/pclose calls */ +#ifdef WIN32 +#define popen(x,y) _popen(x,y) +#define pclose(x) _pclose(x) +#endif + #endif /* COMMON_H */ |