Index: src/bin/psql/common.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/common.c,v
retrieving revision 1.50
diff -c -c -r1.50 common.c
*** src/bin/psql/common.c	24 Oct 2002 01:33:50 -0000	1.50
--- src/bin/psql/common.c	29 Oct 2002 19:15:38 -0000
***************
*** 6,12 ****
   * $Header: /cvsroot/pgsql-server/src/bin/psql/common.c,v 1.50 2002/10/24 01:33:50 momjian Exp $
   */
  #include "postgres_fe.h"
- 
  #include "common.h"
  
  #include <errno.h>
--- 6,11 ----
***************
*** 27,35 ****
  
  #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
--- 26,31 ----
Index: src/bin/psql/common.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/common.h,v
retrieving revision 1.20
diff -c -c -r1.20 common.h
*** src/bin/psql/common.h	23 Oct 2002 19:23:56 -0000	1.20
--- src/bin/psql/common.h	29 Oct 2002 19:15:38 -0000
***************
*** 42,45 ****
--- 42,51 ----
  /* 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 */