From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Sat, 3 Jan 2009 17:55:29 +0000 (+0100)
Subject: Merge branch 'schwern/y2038' into blead
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f433f45e728fb8fd90ae712c4daa4fb4cf2cb6c2;p=p5sagit%2Fp5-mst-13.2.git

Merge branch 'schwern/y2038' into blead

Conflicts:

	lib/Time/Local.pm
	lib/Time/Local.t
	reentr.h
---

f433f45e728fb8fd90ae712c4daa4fb4cf2cb6c2
diff --cc lib/Time/Local.pm
index 1eb0a02,e5c4f88..fe698d4
--- a/lib/Time/Local.pm
+++ b/lib/Time/Local.pm
@@@ -4,10 -4,9 +4,9 @@@ require Exporter
  use Carp;
  use Config;
  use strict;
- use integer;
  
  use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK );
 -$VERSION   = '1.18_01';
 +$VERSION   = '1.1901';
  
  @ISA       = qw( Exporter );
  @EXPORT    = qw( timegm timelocal );
diff --cc reentr.h
index 9715ef3,e66abd9..004cc46
--- a/reentr.h
+++ b/reentr.h
@@@ -1323,37 -1316,13 +1316,13 @@@ typedef struct 
  #   undef getspnam
  #   if !defined(getspnam) && GETSPNAM_R_PROTO == REENTRANT_PROTO_I_CSBWR
  #       define getspnam(a) ((PL_reentrant_retint = getspnam_r(a, &PL_reentrant_buffer->_spent_struct, PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size, &PL_reentrant_buffer->_spent_ptr)) == 0 ? PL_reentrant_buffer->_spent_ptr : ((PL_reentrant_retint == ERANGE) ? (struct spwd *) Perl_reentrant_retry("getspnam", a) : 0))
 -#  endif /* if defined(PERL_REENTR_API) && (PERL_REENTR_API+0 == 1) */
 +#   endif
  #   if !defined(getspnam) && GETSPNAM_R_PROTO == REENTRANT_PROTO_S_CSBI
  #       define getspnam(a) (getspnam_r(a, &PL_reentrant_buffer->_spent_struct, PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size) ? &PL_reentrant_buffer->_spent_struct : ((errno == ERANGE) ? (struct spwd *) Perl_reentrant_retry("getspnam", a) : 0))
 -#  endif /* if defined(PERL_REENTR_API) && (PERL_REENTR_API+0 == 1) */
 -#   endif /* HAS_GETSPNAM */
 +#   endif
 +#  endif
  #endif /* HAS_GETSPNAM_R */
  
- #ifdef HAS_GMTIME_R
- #  if defined(PERL_REENTR_API) && (PERL_REENTR_API+0 == 1)
- #   undef gmtime
- #   if !defined(gmtime) && GMTIME_R_PROTO == REENTRANT_PROTO_S_TS
- #       define gmtime(a) (gmtime_r(a, &PL_reentrant_buffer->_gmtime_struct) ? &PL_reentrant_buffer->_gmtime_struct : 0)
- #   endif
- #   if !defined(gmtime) && GMTIME_R_PROTO == REENTRANT_PROTO_I_TS
- #       define gmtime(a) (gmtime_r(a, &PL_reentrant_buffer->_gmtime_struct) == 0 ? &PL_reentrant_buffer->_gmtime_struct : 0)
- #   endif
- #  endif
- #endif /* HAS_GMTIME_R */
- 
- #ifdef HAS_LOCALTIME_R
- #  if defined(PERL_REENTR_API) && (PERL_REENTR_API+0 == 1)
- #   undef localtime
- #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_S_TS
- #       define localtime(a) (L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0)
- #   endif
- #   if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_I_TS
- #       define localtime(a) (L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0)
- #   endif
- #  endif
- #endif /* HAS_LOCALTIME_R */
- 
  #ifdef HAS_RANDOM_R
  #  if defined(PERL_REENTR_API) && (PERL_REENTR_API+0 == 1)
  #   undef random