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 3c3ca6daf6a5472f58a781a3012e7173a4370cd6..83d3e6cfb5463ec11d9fcefb88d31c6c536f674d 100644 (file)
--- 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))