/* 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 */
#endif
#ifdef HAS_TM_TM_ZONE
-# ifdef __GLIBC__
- const char *tm_zone;
-# else
- char *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
};