From 48f6bf3125a1cf10c24992f71aa06ec27a718997 Mon Sep 17 00:00:00 2001
From: Brian Fraser <fraserbn@gmail.com>
Date: Fri, 17 May 2013 23:20:07 -0300
Subject: time64.h: Declare tm_zone as const under Android, but not if using
 C++

https://android.googlesource.com/platform/bionic.git/+/master/libc/include/time.h
---
 time64.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'time64.h')

diff --git a/time64.h b/time64.h
index 07bb33fd84..cea1be9ed1 100644
--- a/time64.h
+++ b/time64.h
@@ -28,11 +28,13 @@ struct TM64 {
 #endif
 
 #ifdef HAS_TM_TM_ZONE
-#  ifdef __GLIBC__
-        const char    *tm_zone;
-#  else
-        char    *tm_zone;
+/* If glibc is defined, use const. Otherwise,
+ * if we are on android, use const but not with g++
+ */
+#  if defined(__GLIBC__) || (defined(__ANDROID__) && !defined(__cplusplus))
+        const
 #  endif
+        char    *tm_zone;
 #endif
 };
 
-- 
cgit v1.2.1