summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2008-04-21 18:37:28 +0000
committerMagnus Hagander <magnus@hagander.net>2008-04-21 18:37:28 +0000
commita31b03ba271055f31f94d2d4660a02ccd26d969e (patch)
treea3706df78df45edaee98f7132f4c0ec4524bb8e9 /src/tools
parentbe9ab113663bb328c10306801951b6c573c4d056 (diff)
Clean up float4byval and float8byval handling by dealing with them completely
from inside the build script.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/msvc/Solution.pm19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index e8134f544f9..02606889678 100644
--- 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.39 2008/04/21 10:01:32 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.40 2008/04/21 18:37:28 mha Exp $
#
use Carp;
use strict;
@@ -118,19 +118,24 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
print O "#define USE_SSL 1\n" if ($self->{options}->{openssl});
print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});
- unless ($self->{options}->{float4byval})
+ if ($self->{options}->{float4byval})
+ {
+ print O "#define USE_FLOAT4_BYVAL 1\n";
+ print O "#define FLOAT4PASSBYVAL true\n";
+ }
+ else
{
- # float4byval is the default, so undefine
- print O "#undef USE_FLOAT4_BYVAL\n";
- print O "#undef FLOAT4PASSBYVAL\n";
print O "#define FLOAT4PASSBYVAL false\n";
}
if ($self->{options}->{float8byval})
{
- print O "#define USE_FLOAT8_BYVAL\n";
- print O "#undef FLOAT8PASSBYVAL\n";
+ print O "#define USE_FLOAT8_BYVAL 1\n";
print O "#define FLOAT8PASSBYVAL true\n";
}
+ else
+ {
+ print O "#define FLOAT8PASSBYVAL false\n";
+ }
if ($self->{options}->{uuid})
{