Clean up float4byval and float8byval handling by dealing with them completely

from inside the build script.

2 files changed, 11 insertions, 21 deletions

diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 8501f53d98..1c7e3cd2d0 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -53,13 +53,6 @@
    (--enable-thread-safety) */
 #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. */
 /* #undef GETPWUID_R_5ARG */
 
@@ -623,14 +616,6 @@
 /* Define to 1 to build with Bonjour support. (--with-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.
    (--enable-integer-datetimes) */
 /* #undef USE_INTEGER_DATETIMES */
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 2e23a6a9a7..e656cff0a5 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -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})
         {