aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2007-06-14 13:10:11 +0000
committerMagnus Hagander <magnus@hagander.net>2007-06-14 13:10:11 +0000
commit6d12c7dcd4d2ced2f514bb11038fa4d867a6d7c3 (patch)
tree18a9a13eeb2ba6b924a737c8ed6f19aeb4d479a3 /src
parentbd2cb9aaa55d2c6760e2722557a8a87b0bd40945 (diff)
downloadpostgresql-6d12c7dcd4d2ced2f514bb11038fa4d867a6d7c3.tar.gz
postgresql-6d12c7dcd4d2ced2f514bb11038fa4d867a6d7c3.zip
Properly identify mingw as a win32 platform needing different diff
options to deal with strange line endings.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/ecpg/test/pg_regress_ecpg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/test/pg_regress_ecpg.c b/src/interfaces/ecpg/test/pg_regress_ecpg.c
index c829653f520..ae0aa1c1347 100644
--- a/src/interfaces/ecpg/test/pg_regress_ecpg.c
+++ b/src/interfaces/ecpg/test/pg_regress_ecpg.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress_ecpg.c,v 1.1 2007/06/12 11:07:30 mha Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress_ecpg.c,v 1.2 2007/06/14 13:10:11 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -159,11 +159,11 @@ static void
ecpg_init(void)
{
/* no reason to set -w for ecpg checks, except for when on windows */
- if (strstr(host_platform, "-win32"))
+ if (strstr(host_platform, "-win32") || strstr(host_platform, "-mingw32"))
basic_diff_opts = "-w";
else
basic_diff_opts = "";
- if (strstr(host_platform, "-win32"))
+ if (strstr(host_platform, "-win32") || strstr(host_platform, "-mingw32"))
pretty_diff_opts = "-C3 -w";
else
pretty_diff_opts = "-C3";