diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2013-01-25 11:39:45 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2013-01-25 11:39:45 -0500 |
| commit | 812451d1c7a0ad298cdf3a5e04bd3e9d1d700664 (patch) | |
| tree | 59f35a4ee9b22c267f997baef566b701f47c2f48 | |
| parent | a2d44f526ec4b9832b3fff852981652ba9d05e8a (diff) | |
| download | postgresql-812451d1c7a0ad298cdf3a5e04bd3e9d1d700664.tar.gz | |
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.
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 51a04473a6..0b3a83b9ef 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") |