diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CORE/time64.h')
| -rw-r--r-- | Master/tlpkg/tlperl/lib/CORE/time64.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Master/tlpkg/tlperl/lib/CORE/time64.h b/Master/tlpkg/tlperl/lib/CORE/time64.h index 07bb33fd849..b7306d01fb4 100644 --- a/Master/tlpkg/tlperl/lib/CORE/time64.h +++ b/Master/tlpkg/tlperl/lib/CORE/time64.h @@ -28,11 +28,14 @@ struct TM64 { #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 }; |