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 51a04473a645d43078cd36b3a00deb3ca563c29b..0b3a83b9ef3ff2288b34ceb829841e5ff30ec7d3 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 CLUSTER_NAME(cluster)  ((cluster) == &old_cluster ? "old" : \
                                                                 (cluster) == &new_cluster ? "new" : "none")