From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 25 Jan 2013 16:39:45 +0000 (-0500)
Subject: Unbreak 9.0 and 9.1 pg_upgrade.
X-Git-Tag: REL9_1_8~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=812451d1c7a0ad298cdf3a5e04bd3e9d1d700664;p=thirdparty%2Fpostgresql.git

Unbreak 9.0 and 9.1 pg_upgrade.

These were broken by my recent backpatch of
the simple prompt fix. These older versions
used DEVTTY, so import the definition from
psql's command.c.
---

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 51a04473a64..0b3a83b9ef3 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -54,6 +54,17 @@
 #define EXE_EXT				".exe"
 #endif
 
+#if defined(WIN32) && !defined(__CYGWIN__)
+
+		/*
+		 * XXX This does not work for all terminal environments or for output
+		 * containing non-ASCII characters; see comments in simple_prompt().
+		 */
+#define DEVTTY	"con"
+#else
+#define DEVTTY	"/dev/tty"
+#endif
+
 #define CLUSTER_NAME(cluster)	((cluster) == &old_cluster ? "old" : \
 								 (cluster) == &new_cluster ? "new" : "none")