Commit a31b03ba authored by Magnus Hagander's avatar Magnus Hagander

Clean up float4byval and float8byval handling by dealing with them completely

from inside the build script.
parent be9ab113
...@@ -53,13 +53,6 @@ ...@@ -53,13 +53,6 @@
(--enable-thread-safety) */ (--enable-thread-safety) */
#define ENABLE_THREAD_SAFETY 1 #define ENABLE_THREAD_SAFETY 1
/* float4 values are passed by value if 'true', by reference if 'false' */
#define FLOAT4PASSBYVAL true
/* float8, int8, and related values are passed by value if 'true', by
reference if 'false' */
#define FLOAT8PASSBYVAL false
/* Define to 1 if getpwuid_r() takes a 5th argument. */ /* Define to 1 if getpwuid_r() takes a 5th argument. */
/* #undef GETPWUID_R_5ARG */ /* #undef GETPWUID_R_5ARG */
...@@ -623,14 +616,6 @@ ...@@ -623,14 +616,6 @@
/* Define to 1 to build with Bonjour support. (--with-bonjour) */ /* Define to 1 to build with Bonjour support. (--with-bonjour) */
/* #undef USE_BONJOUR */ /* #undef USE_BONJOUR */
/* Define to 1 if you want float4 values to be passed by value.
(--enable-float4-byval) */
#define USE_FLOAT4_BYVAL 1
/* Define to 1 if you want float8, int8, etc values to be passed by value.
(--enable-float8-byval) */
/* #undef USE_FLOAT8_BYVAL */
/* Define to 1 if you want 64-bit integer timestamp and interval support. /* Define to 1 if you want 64-bit integer timestamp and interval support.
(--enable-integer-datetimes) */ (--enable-integer-datetimes) */
/* #undef USE_INTEGER_DATETIMES */ /* #undef USE_INTEGER_DATETIMES */
......
...@@ -3,7 +3,7 @@ package Solution; ...@@ -3,7 +3,7 @@ package Solution;
# #
# Package that encapsulates a Visual C++ solution file generation # 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 Carp;
use strict; use strict;
...@@ -118,19 +118,24 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY ...@@ -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 USE_SSL 1\n" if ($self->{options}->{openssl});
print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls}); 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"; print O "#define FLOAT4PASSBYVAL false\n";
} }
if ($self->{options}->{float8byval}) if ($self->{options}->{float8byval})
{ {
print O "#define USE_FLOAT8_BYVAL\n"; print O "#define USE_FLOAT8_BYVAL 1\n";
print O "#undef FLOAT8PASSBYVAL\n";
print O "#define FLOAT8PASSBYVAL true\n"; print O "#define FLOAT8PASSBYVAL true\n";
} }
else
{
print O "#define FLOAT8PASSBYVAL false\n";
}
if ($self->{options}->{uuid}) if ($self->{options}->{uuid})
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment