diff options
Diffstat (limited to 'src/bin/pg_ctl/pg_ctl.c')
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index fe8c02700f..bd96916929 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.93 2008/02/20 22:18:15 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.94 2008/02/20 22:46:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -33,6 +33,7 @@ #include "libpq/pqsignal.h" #include "getopt_long.h" +#include "miscadmin.h" #if defined(__CYGWIN__) #include <sys/cygwin.h> @@ -49,10 +50,6 @@ int optreset; typedef long pgpid_t; -/* postgres version ident string */ -#define PM_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n" - - typedef enum { SMART_MODE, @@ -659,7 +656,7 @@ do_start(void) postmaster_path = pg_malloc(MAXPGPATH); - if ((ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, + if ((ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR, postmaster_path)) < 0) { char full_path[MAXPGPATH]; @@ -1020,7 +1017,8 @@ pgwin32_CommandLine(bool registration) } else { - ret = find_other_exec(argv0, "postgres", PM_VERSIONSTR, cmdLine); + ret = find_other_exec(argv0, "postgres", PG_BACKEND_VERSIONSTR, + cmdLine); if (ret != 0) { write_stderr(_("%s: could not find postgres program executable\n"), progname); |