diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-10-16 03:32:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-10-16 03:32:08 +0000 |
| commit | 72f9013741833ddbecdbb46930bf0f62e4176803 (patch) | |
| tree | 36447d4d324a42b9d1655f1afdd63dcc9880d323 /src | |
| parent | c7add816f598d5a67bc846f890f1c1d3354a98a3 (diff) | |
| download | postgresql-72f9013741833ddbecdbb46930bf0f62e4176803.tar.gz postgresql-72f9013741833ddbecdbb46930bf0f62e4176803.zip | |
Fix Cygwin using of pg_ctl by not usig START.
Reini Urban
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 40674c305b4..0c31206be49 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-2004, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.39 2004/10/16 03:10:14 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.40 2004/10/16 03:32:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,8 @@ #if defined(__CYGWIN__) #include <windows.h> +/* Cygwin defines WIN32 in windows.h, but we don't want it. */ +#undef WIN32 #endif #ifndef HAVE_OPTRESET @@ -333,7 +335,7 @@ start_postmaster(void) * http://dev.remotenetworktechnology.com/cmd/cmdfaq.htm */ if (log_file != NULL) -#if !defined(WIN32) && !defined(__CYGWIN__) +#if !defined(WIN32) /* Cygwin doesn't have START */ snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &%s", #else snprintf(cmd, MAXPGPATH, "%sSTART /B \"\" \"%s\" %s%s < \"%s\" >> \"%s\" 2>&1%s", @@ -341,7 +343,7 @@ start_postmaster(void) SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts, DEVNULL, log_file, SYSTEMQUOTE); else -#if !defined(WIN32) && !defined(__CYGWIN__) +#if !defined(WIN32) /* Cygwin doesn't have START */ snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" 2>&1 &%s", #else snprintf(cmd, MAXPGPATH, "%sSTART /B \"\" \"%s\" %s%s < \"%s\" 2>&1%s", |