X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=reentr.h;h=004cc46b6cb1a84b7b2c1cc0ec2f67234345fc58;hb=2bab0636fd7890b7f252b039f74b158a58919c44;hp=9715ef3e5c8fe616c5b17d223bee472e6d2c1160;hpb=d4222de00860407a7c86f19fdb5531ac98b1b7ad;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/reentr.h b/reentr.h
index 9715ef3..004cc46 100644
--- a/reentr.h
+++ b/reentr.h
@@ -185,13 +185,12 @@
 #define REENTRANT_PROTO_S_SBIE	69
 #define REENTRANT_PROTO_S_SBW	70
 #define REENTRANT_PROTO_S_TISBI	71
-#define REENTRANT_PROTO_S_TS	72
-#define REENTRANT_PROTO_S_TSBI	73
-#define REENTRANT_PROTO_S_TSBIE	74
-#define REENTRANT_PROTO_S_TWISBIE	75
-#define REENTRANT_PROTO_V_D	76
-#define REENTRANT_PROTO_V_H	77
-#define REENTRANT_PROTO_V_ID	78
+#define REENTRANT_PROTO_S_TSBI	72
+#define REENTRANT_PROTO_S_TSBIE	73
+#define REENTRANT_PROTO_S_TWISBIE	74
+#define REENTRANT_PROTO_V_D	75
+#define REENTRANT_PROTO_V_H	76
+#define REENTRANT_PROTO_V_ID	77
 
 /* Defines for indicating which special features are supported. */
 
@@ -740,12 +739,6 @@ typedef struct {
 	FILE*	_spent_fptr;
 #   endif
 #endif /* HAS_GETSPNAM_R */
-#ifdef HAS_GMTIME_R
-	struct tm _gmtime_struct;
-#endif /* HAS_GMTIME_R */
-#ifdef HAS_LOCALTIME_R
-	struct tm _localtime_struct;
-#endif /* HAS_LOCALTIME_R */
 #ifdef HAS_RANDOM_R
 	struct random_data _random_struct;
 #   if RANDOM_R_PROTO == REENTRANT_PROTO_I_iS
@@ -1330,30 +1323,6 @@ typedef struct {
 #  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