X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=time64.h;h=000f1018cbeecbbdaf80b5c2eab4b43153d1e08c;hb=9e64a656431ae7084348f10746204bf46a419824;hp=e8c649b866886fdde56c90b5028d766a38d43de1;hpb=b86b480f7301a8816081189c89b366a79ab9909f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/time64.h b/time64.h
index e8c649b..000f101 100644
--- a/time64.h
+++ b/time64.h
@@ -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