Skip to content

Commit 52be3aa

Browse files
committed
Fix warnings added in 8d9a0e8.
1 parent d4635b1 commit 52be3aa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/tools/msvc/Solution.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,13 @@ sub GenerateFiles
162162
|| confess "Could not open pg_config.h.win32\n";
163163
open(O, ">src\\include\\pg_config.h")
164164
|| confess "Could not write to pg_config.h\n";
165+
my $extraver = $self->{options}->{extraver};
166+
$extraver = '' unless defined $extraver;
165167
while (<I>)
166168
{
167-
s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$self->{options}->{extraver}"};
169+
s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$extraver"};
168170
s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}};
169-
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL $self->{strver}$self->{options}->{extraver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ", $bits-bit"};
171+
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ", $bits-bit"};
170172
print O;
171173
}
172174
print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";

0 commit comments

Comments
 (0)