Skip to content

Commit ecfbbfc

Browse files
committed
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.
1 parent 6121539 commit ecfbbfc

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

contrib/pg_upgrade/pg_upgrade.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@
5454
#define EXE_EXT ".exe"
5555
#endif
5656

57+
#if defined(WIN32) && !defined(__CYGWIN__)
58+
59+
/*
60+
* XXX This does not work for all terminal environments or for output
61+
* containing non-ASCII characters; see comments in simple_prompt().
62+
*/
63+
#define DEVTTY "con"
64+
#else
65+
#define DEVTTY "/dev/tty"
66+
#endif
67+
5768
#define CLUSTERNAME(cluster) ((cluster) == CLUSTER_OLD ? "old" : "new")
5869

5970
#define atooid(x) ((Oid) strtoul((x), NULL, 10))

0 commit comments

Comments
 (0)