Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitef58b87

Browse files
committed
Restore setting of _USE_32BIT_TIME_T to 32 bit MSVC builds.
This was removed in commitcd00406,we're not quite sure why, but there have been reports of crashes dueto AS Perl being built with it when we are not, and it certainlyseems like the right thing to do. There is still some uncertaintyas to why it sometimes fails and sometimes doesn't.Original patch from Owais Khani, substantially reworked andextended by Andrew Dunstan.
1 parentc97a547 commitef58b87

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

‎src/tools/msvc/MSBuildProject.pm

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,22 @@ EOF
6161
print$f<<EOF;
6262
</PropertyGroup>
6363
EOF
64+
65+
# We have to use this flag on 32 bit targets because the 32bit perls
66+
# are built with it and sometimes crash if we don't.
67+
my$use_32bit_time_t =
68+
$self->{platform}eq'Win32' ?'_USE_32BIT_TIME_T;' :'';
69+
6470
$self->WriteItemDefinitionGroup(
6571
$f,'Debug',
66-
{defs=>'_DEBUG;DEBUG=1;',
72+
{defs=>"_DEBUG;DEBUG=1;$use_32bit_time_t",
6773
opt=>'Disabled',
6874
strpool=>'false',
6975
runtime=>'MultiThreadedDebugDLL' });
7076
$self->WriteItemDefinitionGroup(
7177
$f,
7278
'Release',
73-
{defs=>'',
79+
{defs=>"$use_32bit_time_t",
7480
opt=>'Full',
7581
strpool=>'true',
7682
runtime=>'MultiThreadedDLL' });

‎src/tools/msvc/VCBuildProject.pm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,24 @@ sub WriteHeader
3232
<Platforms><Platform Name="$self->{platform}"/></Platforms>
3333
<Configurations>
3434
EOF
35+
36+
# We have to use this flag on 32 bit targets because the 32bit perls
37+
# are built with it and sometimes crash if we don't.
38+
my$use_32bit_time_t =
39+
$self->{platform}eq'Win32' ?'_USE_32BIT_TIME_T;' :'';
40+
41+
3542
$self->WriteConfiguration(
3643
$f,'Debug',
37-
{defs=>'_DEBUG;DEBUG=1;',
44+
{defs=>"_DEBUG;DEBUG=1;$use_32bit_time_t",
3845
wholeopt=> 0,
3946
opt=> 0,
4047
strpool=>'false',
4148
runtime=> 3 });
4249
$self->WriteConfiguration(
4350
$f,
4451
'Release',
45-
{defs=>'',
52+
{defs=>"$use_32bit_time_t",
4653
wholeopt=> 0,
4754
opt=> 3,
4855
strpool=>'true',

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp