diff options
| author | Noah Misch <noah@leadboat.com> | 2014-07-14 14:07:12 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-07-14 14:07:12 -0400 |
| commit | 52be3aae5bfe84346b7ce202eae3447a07dfc882 (patch) | |
| tree | 78830b57ce050e27c8f3eb237f4599c3fd0a7f2d | |
| parent | d4635b16fe3d0fae65d7735d9e926a1b20a90781 (diff) | |
| download | postgresql-52be3aae5bfe84346b7ce202eae3447a07dfc882.tar.gz postgresql-52be3aae5bfe84346b7ce202eae3447a07dfc882.zip | |
Fix warnings added in 8d9a0e85bd6ab4fe5268a1d759a787f72ff9333e.
| -rw-r--r-- | src/tools/msvc/Solution.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index d53803e1860..89e4b07c801 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -162,11 +162,13 @@ sub GenerateFiles || confess "Could not open pg_config.h.win32\n"; open(O, ">src\\include\\pg_config.h") || confess "Could not write to pg_config.h\n"; + my $extraver = $self->{options}->{extraver}; + $extraver = '' unless defined $extraver; while (<I>) { - s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$self->{options}->{extraver}"}; + s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$extraver"}; s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}}; - 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"}; + 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"}; print O; } print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n"; |