Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit cf376a4

Browse files
committed
Enable float8-byval as the default for 64 bit MSVC builds
This is a long-standing inconsistency that was probably just missed when we got 64 bit MSVC builds. This brings the platform into line with all other systems.
1 parent 0ef0396 commit cf376a4

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/tools/msvc/Solution.pm

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,18 @@ sub _new
2525
platform => undef, };
2626
bless($self, $classname);
2727

28+
$self->DeterminePlatform();
29+
my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
30+
2831
# integer_datetimes is now the default
2932
$options->{integer_datetimes} = 1
3033
unless exists $options->{integer_datetimes};
3134
$options->{float4byval} = 1
3235
unless exists $options->{float4byval};
36+
$options->{float8byval} = ($bits == 64)
37+
unless exists $options->{float8byval};
38+
die "float8byval not permitted on 32 bit platforms"
39+
if $options->{float8byval} && $bits == 32;
3340
if ($options->{xml})
3441
{
3542
if (!($options->{xslt} && $options->{iconv}))
@@ -56,8 +63,6 @@ sub _new
5663
die "Bad wal_segsize $options->{wal_segsize}"
5764
unless grep { $_ == $options->{wal_segsize} } (1, 2, 4, 8, 16, 32, 64);
5865

59-
$self->DeterminePlatform();
60-
6166
return $self;
6267
}
6368

src/tools/msvc/config_default.pl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
asserts => 0, # --enable-cassert
77
# integer_datetimes=>1, # --enable-integer-datetimes - on is now default
88
# float4byval=>1, # --disable-float4-byval, on by default
9-
# float8byval=>0, # --disable-float8-byval, off by default
9+
10+
# float8byval=> $platformbits == 64, # --disable-float8-byval,
11+
# off by default on 32 bit platforms, on by default on 64 bit platforms
12+
1013
# blocksize => 8, # --with-blocksize, 8kB by default
1114
# wal_blocksize => 8, # --with-wal-blocksize, 8kB by default
1215
# wal_segsize => 16, # --with-wal-segsize, 16MB by default

0 commit comments

Comments
 (0)