upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-06-09 00:32:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbreak 9.0 and 9.1 pg_upgrade.

Browse source 
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.
This commit is contained in:
Andrew Dunstan 2013-01-25 11:39:17 -05:00
parent 6121539aca
commit ecfbbfc0ef
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/pg_upgrade/pg_upgrade.h
View file

@ -54,6 +54,17 @@
#define EXE_EXT ".exe" #define EXE_EXT ".exe"
#endif #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 CLUSTERNAME(cluster) ((cluster) == CLUSTER_OLD ? "old" : "new")
#define atooid(x) ((Oid) strtoul((x), NULL, 10)) #define atooid(x) ((Oid) strtoul((x), NULL, 10))