commit 905e6d58aaf515bf237e62078f8a321920fe4c6b
author Elliott Hughes <enh@google.com> Fri Jul 25 11:55:59 2014 -0700
committer Elliott Hughes <enh@google.com> Fri Jul 25 12:03:51 2014 -0700
tree 07ee9fad11490db7e30bc27e359d5d1adf950cef
parent 123172ae370fe51e2d1fc26fe0aafa095af52919

Start hiding "private/bionic_time.h".

Bug: 15765976
Change-Id: Ibd9cf07067ec8dffe9fda6c3d498d4ab90708220

libc/tzcode/localtime.c

diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c
index 4dd7ab0..2e6804e 100644
--- a/libc/tzcode/localtime.c
+++ b/libc/tzcode/localtime.c
@@ -2293,7 +2293,8 @@
 }
 
 // Non-standard API: mktime(3) but with an explicit timezone parameter.
-time_t __attribute__((visibility("default"))) mktime_tz(struct tm* const tmp, const char* tz) {
+// This can't actually be hidden/removed until we fix MtpUtils.cpp
+__attribute__((visibility("default"))) time_t mktime_tz(struct tm* const tmp, const char* tz) {
   struct state* st = malloc(sizeof(*st));
   time_t return_value;
 
@@ -2310,7 +2311,8 @@
 }
 
 // Non-standard API: localtime(3) but with an explicit timezone parameter.
-void __attribute__((visibility("default"))) localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz) {
+#if !defined(__LP64__)
+__attribute__((visibility("default"))) void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz) {
   struct state* st = malloc(sizeof(*st));
 
   if (st == NULL)
@@ -2322,5 +2324,6 @@
   localsub(timep, 0L, tmp, st);
   free(st);
 }
+#endif
 
 // END android-added