Index: src/include/port.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/port.h,v
retrieving revision 1.88
diff -c -c -r1.88 port.h
*** src/include/port.h	4 Mar 2006 04:30:40 -0000	1.88
--- src/include/port.h	5 Mar 2006 05:29:09 -0000
***************
*** 84,90 ****
  
  #if defined(WIN32) && !defined(__CYGWIN__)
  #define DEVNULL "nul"
! /* "con" does not work from the MinGW 1.0.10 console. */
  #define DEVTTY	"con"
  #else
  #define DEVNULL "/dev/null"
--- 84,90 ----
  
  #if defined(WIN32) && !defined(__CYGWIN__)
  #define DEVNULL "nul"
! /* "con" does not work from the Msys 1.0.10 console (part of MinGW). */
  #define DEVTTY	"con"
  #else
  #define DEVNULL "/dev/null"
Index: src/port/sprompt.c
===================================================================
RCS file: /cvsroot/pgsql/src/port/sprompt.c,v
retrieving revision 1.14
diff -c -c -r1.14 sprompt.c
*** src/port/sprompt.c	4 Mar 2006 04:30:41 -0000	1.14
--- src/port/sprompt.c	5 Mar 2006 05:29:10 -0000
***************
*** 65,71 ****
  	 */
  	termin = fopen(DEVTTY, "r");
  	termout = fopen(DEVTTY, "w");
! 	if (!termin || !termout)
  	{
  		if (termin)
  			fclose(termin);
--- 65,76 ----
  	 */
  	termin = fopen(DEVTTY, "r");
  	termout = fopen(DEVTTY, "w");
! 	if (!termin || !termout
! #ifdef WIN32
! 		/* See DEVTTY comment for msys */
! 		|| (getenv("OSTYPE") && strcmp(getenv("OSTYPE"), "msys") == 0)
! #endif
! 		)
  	{
  		if (termin)
  			fclose(termin);