git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c

index 40674c305b40ea7f967ecce66da60c8eb19253d1..0c31206be492d001a863757a32a155877e16957e 100644 (file)

--- a/src/bin/pg_ctl/pg_ctl.c

+++ b/src/bin/pg_ctl/pg_ctl.c

*

* 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 $

*

*-------------------------------------------------------------------------

*/

#if defined(__CYGWIN__)

#include <windows.h>

+/* Cygwin defines WIN32 in windows.h, but we don't want it. */

+#undef WIN32

#endif

#ifndef HAVE_OPTRESET

* 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",

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",