projects
/
platform
/
upstream
/
perl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b200d44
)
time64.h: Declare tm_zone as const under Android, but not if using C++
author
Brian Fraser
<fraserbn@gmail.com>
Sat, 18 May 2013 02:20:07 +0000
(23:20 -0300)
committer
Brian Fraser
<fraserbn@gmail.com>
Thu, 23 Jan 2014 13:17:31 +0000
(14:17 +0100)
https://android.googlesource.com/platform/bionic.git/+/master/libc/include/time.h
time64.h
patch
|
blob
|
history
diff --git
a/time64.h
b/time64.h
index
07bb33f
..
cea1be9
100644
(file)
--- 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
};