From: Andrew Dunstan <andrew@dunslane.net>
Date: Fri, 25 Jan 2013 16:39:17 +0000 (-0500)
Subject: Unbreak 9.0 and 9.1 pg_upgrade.
X-Git-Tag: REL9_0_12~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecfbbfc0ef70f2b6b8744e2da3ec54fd7ef8c357;p=postgresql

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 3c3ca6daf6..83d3e6cfb5 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 CLUSTERNAME(cluster)	((cluster) == CLUSTER_OLD ? "old" : "new")
 
 #define atooid(x)  ((Oid) strtoul((x), NULL, 10))