Quiet warnings about redefined PGPORT macros for MSVC.

adunstan · adunstan · commit 52ba24a156f3 · 2007-06-20T17:19:00.000Z
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -3,7 +3,7 @@ package Solution;
 #
 # Package that encapsulates a Visual C++ solution file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.26 2007/05/27 11:16:41 meskes Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.27 2007/06/20 17:19:00 adunstan Exp $
 #
 use Carp;
 use strict;
@@ -127,6 +127,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
         }
 		if (my $port = $self->{options}->{"--with-pgport"})
 		{
+			print O "#undef DEF_PGPORT\n";
+			print O "#undef DEF_PGPORT_STR\n";
 			print O "#define DEF_PGPORT $port\n";
 			print O "#define DEF_PGPORT_STR \"$port\"\n";
 		}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.26 2007/05/27 11:16:41 meskes Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.27 2007/06/20 17:19:00 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -127,6 +127,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`127`	`127`	`}`
`128`	`128`	`if (my $port = $self->{options}->{"--with-pgport"})`
`129`	`129`	`{`
	`130`	`+ print O "#undef DEF_PGPORT\n";`
	`131`	`+ print O "#undef DEF_PGPORT_STR\n";`
`130`	`132`	`print O "#define DEF_PGPORT $port\n";`
`131`	`133`	`print O "#define DEF_PGPORT_STR \"$port\"\n";`
`132`	`134`	`}`