aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/MSBuildProject.pm9
-rw-r--r--src/tools/msvc/Mkvcbuild.pm5
-rw-r--r--src/tools/msvc/VCBuildProject.pm10
3 files changed, 7 insertions, 17 deletions
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index d7638b458ef..27329f9e361 100644
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -63,21 +63,16 @@ EOF
</PropertyGroup>
EOF
- # We have to use this flag on 32 bit targets because the 32bit perls
- # are built with it and sometimes crash if we don't.
- my $use_32bit_time_t =
- $self->{platform} eq 'Win32' ? '_USE_32BIT_TIME_T;' : '';
-
$self->WriteItemDefinitionGroup(
$f, 'Debug',
- { defs => "_DEBUG;DEBUG=1;$use_32bit_time_t",
+ { defs => "_DEBUG;DEBUG=1",
opt => 'Disabled',
strpool => 'false',
runtime => 'MultiThreadedDebugDLL' });
$self->WriteItemDefinitionGroup(
$f,
'Release',
- { defs => "$use_32bit_time_t",
+ { defs => "",
opt => 'Full',
strpool => 'true',
runtime => 'MultiThreadedDLL' });
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index a7e3a014d7a..c2e7f250973 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -522,14 +522,15 @@ sub mkvcbuild
my @perl_embed_ccflags;
foreach my $f (split(" ",$Config{ccflags}))
{
- if ($f =~ /^-D[^_]/)
+ if ($f =~ /^-D[^_]/ ||
+ $f =~ /^-D_USE_32BIT_TIME_T/)
{
$f =~ s/\-D//;
push(@perl_embed_ccflags, $f);
}
}
- # XXX this probably is redundant now?
+ # Also, a hack to prevent duplicate definitions of uid_t/gid_t
push(@perl_embed_ccflags, 'PLPERL_HAVE_UID_GID');
foreach my $f (@perl_embed_ccflags)
diff --git a/src/tools/msvc/VCBuildProject.pm b/src/tools/msvc/VCBuildProject.pm
index a8d75d88f31..669ba1730bc 100644
--- a/src/tools/msvc/VCBuildProject.pm
+++ b/src/tools/msvc/VCBuildProject.pm
@@ -33,15 +33,9 @@ sub WriteHeader
<Configurations>
EOF
- # We have to use this flag on 32 bit targets because the 32bit perls
- # are built with it and sometimes crash if we don't.
- my $use_32bit_time_t =
- $self->{platform} eq 'Win32' ? '_USE_32BIT_TIME_T;' : '';
-
-
$self->WriteConfiguration(
$f, 'Debug',
- { defs => "_DEBUG;DEBUG=1;$use_32bit_time_t",
+ { defs => "_DEBUG;DEBUG=1",
wholeopt => 0,
opt => 0,
strpool => 'false',
@@ -49,7 +43,7 @@ EOF
$self->WriteConfiguration(
$f,
'Release',
- { defs => "$use_32bit_time_t",
+ { defs => "",
wholeopt => 0,
opt => 3,
strpool => 'true',