OPpLVAL_INTRO: not used by pos substr vec

[perl5.git] / time64.h

diff --git a/time64.h b/time64.h
index e8c649b..b7306d0 100644 (file)
--- 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,6 +28,13 @@ struct TM64 {
 #endif
 
 #ifdef HAS_TM_TM_ZONE
+/* If glibc is defined or we are on QNX, use const.
+ * Otherwise, if we are on android, use const but
+ * not with g++.
+ */
+#  if defined(__GLIBC__) || (defined(__ANDROID__) && !defined(__cplusplus)) || defined(__QNX__)
+        const
+#  endif
         char    *tm_zone;
 #endif
 };
@@ -41,22 +48,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