X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a8cb02613db44c6c8a53ff84a0d959222f9c694f..4c69840c35bf098eed0d3d68400611fc7fa3fce4:/time64.h

diff --git a/time64.h b/time64.h
index 7545e08..07bb33f 100644
--- a/time64.h
+++ b/time64.h
@@ -8,7 +8,7 @@
 /* Set our custom types */
 typedef INT_64_T        Int64;
 typedef Int64           Time64_T;
-typedef Int64           Year;
+typedef I32             Year;
 
 
 /* A copy of the tm struct but with a 64 bit year */
@@ -28,7 +28,11 @@ struct TM64 {
 #endif
 
 #ifdef HAS_TM_TM_ZONE
+#  ifdef __GLIBC__
         const char    *tm_zone;
+#  else
+        char    *tm_zone;
+#  endif
 #endif
 };
 
@@ -41,22 +45,22 @@ struct TM64 {
 #endif
 
 
-/* Declare public functions */
-struct TM *gmtime64_r    (const Time64_T *, struct TM *);
-struct TM *localtime64_r (const Time64_T *, struct TM *);
-Time64_T   timegm64      (struct TM *);
+/* Declare functions */
+static struct TM *S_gmtime64_r    (const Time64_T *, struct TM *);
+static struct TM *S_localtime64_r (const Time64_T *, struct TM *);
+static Time64_T   S_timegm64      (struct TM *);
 
 
 /* Not everyone has gm/localtime_r(), provide a replacement */
 #ifdef HAS_LOCALTIME_R
-#    define LOCALTIME_R(clock, result) localtime_r(clock, result)
+#    define LOCALTIME_R(clock, result) (L_R_TZSET localtime_r(clock, result))
 #else
-#    define LOCALTIME_R(clock, result) fake_localtime_r(clock, result)
+#    define LOCALTIME_R(clock, result) (L_R_TZSET S_localtime_r(clock, result))
 #endif
 #ifdef HAS_GMTIME_R
 #    define GMTIME_R(clock, result)    gmtime_r(clock, result)
 #else
-#    define GMTIME_R(clock, result)    fake_gmtime_r(clock, result)
+#    define GMTIME_R(clock, result)    S_gmtime_r(clock, result)
 #endif
 
 #endif