diff options
author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-01-03 18:55:29 +0100 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-01-03 18:55:29 +0100 |
commit | f433f45e728fb8fd90ae712c4daa4fb4cf2cb6c2 (patch) | |
tree | a495247209955f13920d0cd895025f77c8854f34 /reentr.pl | |
parent | 2547c837a73d50421f898a78d070bf820ac97f12 (diff) | |
parent | d4fb0a1f15d1a1c49224933a2cf320efa700d961 (diff) | |
download | perl-f433f45e728fb8fd90ae712c4daa4fb4cf2cb6c2.tar.gz |
Merge branch 'schwern/y2038' into blead
Conflicts:
lib/Time/Local.pm
lib/Time/Local.t
reentr.h
Diffstat (limited to 'reentr.pl')
-rw-r--r-- | reentr.pl | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -504,7 +504,7 @@ EOF EOF pushssif $endif; } - elsif ($func =~ /^(drand48|gmtime|localtime|random|srandom)$/) { + elsif ($func =~ /^(drand48|random|srandom)$/) { pushssif $ifdef; push @struct, <<EOF; $seent{$func} _${func}_struct; @@ -716,9 +716,6 @@ EOF } my $call = "${func}_r($v$w)"; - if ($func eq 'localtime') { - $call = "L_R_TZSET $call"; - } # Must make OpenBSD happy my $memzero = ''; @@ -1124,8 +1121,6 @@ getservbyname CC|netdb |struct servent |I_CCSBWR|S_CCSBI|I_CCSD|D=struct servent getservbyport IC|netdb |struct servent |I_ICSBWR|S_ICSBI|I_ICSD|D=struct servent_data* getservent |netdb |struct servent |I_SBWR|I_SBI|S_SBI|I_SD|D=struct servent_data* getspnam C |shadow |struct spwd |I_CSBWR|S_CSBI -gmtime T |time |struct tm |S_TS|I_TS|T=const time_t* -localtime T |time |struct tm |S_TS|I_TS|T=const time_t* random |stdlib |struct random_data|I_iS|I_lS|I_St|i=int*|l=long*|t=int32_t* readdir T |dirent |struct dirent |I_TSR|I_TS|T=DIR* readdir64 T |dirent |struct dirent64|I_TSR|I_TS|T=DIR* |