|
4 | 4 | * |
5 | 5 | * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group |
6 | 6 | * |
7 | | - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.39 2004/10/16 03:10:14 momjian Exp $ |
| 7 | + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.40 2004/10/16 03:32:08 momjian Exp $ |
8 | 8 | * |
9 | 9 | *------------------------------------------------------------------------- |
10 | 10 | */ |
|
23 | 23 |
|
24 | 24 | #if defined(__CYGWIN__) |
25 | 25 | #include<windows.h> |
| 26 | +/* Cygwin defines WIN32 in windows.h, but we don't want it. */ |
| 27 | +#undef WIN32 |
26 | 28 | #endif |
27 | 29 |
|
28 | 30 | #ifndefHAVE_OPTRESET |
@@ -333,15 +335,15 @@ start_postmaster(void) |
333 | 335 | * http://dev.remotenetworktechnology.com/cmd/cmdfaq.htm |
334 | 336 | */ |
335 | 337 | if (log_file!=NULL) |
336 | | -#if !defined(WIN32)&& !defined(__CYGWIN__) |
| 338 | +#if !defined(WIN32)/* Cygwin doesn't have START */ |
337 | 339 | snprintf(cmd,MAXPGPATH,"%s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &%s", |
338 | 340 | #else |
339 | 341 | snprintf(cmd,MAXPGPATH,"%sSTART /B \"\" \"%s\" %s%s < \"%s\" >> \"%s\" 2>&1%s", |
340 | 342 | #endif |
341 | 343 | SYSTEMQUOTE,postgres_path,pgdata_opt,post_opts, |
342 | 344 | DEVNULL,log_file,SYSTEMQUOTE); |
343 | 345 | else |
344 | | -#if !defined(WIN32)&& !defined(__CYGWIN__) |
| 346 | +#if !defined(WIN32)/* Cygwin doesn't have START */ |
345 | 347 | snprintf(cmd,MAXPGPATH,"%s\"%s\" %s%s < \"%s\" 2>&1 &%s", |
346 | 348 | #else |
347 | 349 | snprintf(cmd,MAXPGPATH,"%sSTART /B \"\" \"%s\" %s%s < \"%s\" 2>&1%s", |
|