summaryrefslogtreecommitdiffstats
path: root/libc/tzcode
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-05 17:14:02 -0700
committerElliott Hughes <enh@google.com>2014-05-05 17:14:02 -0700
commit52defb7c702306d4e81c7089cbadd7a6da1d7b6b (patch)
treef392cbb7cee51948dabbebc8baf3793600f9b61a /libc/tzcode
parent629d892d0b5ec061b5260453d72fa54ab3d7ce37 (diff)
downloadbionic-52defb7c702306d4e81c7089cbadd7a6da1d7b6b.zip
bionic-52defb7c702306d4e81c7089cbadd7a6da1d7b6b.tar.gz
bionic-52defb7c702306d4e81c7089cbadd7a6da1d7b6b.tar.bz2
Remove the non-standard time64 stuff for LP64.
We need a workaround in strftime as long as we still need to support 64-bit times on LP32. Change-Id: I8ffb616f6312d4063fb9ea3c36b52653e8f4c5f8
Diffstat (limited to 'libc/tzcode')
-rw-r--r--libc/tzcode/strftime.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libc/tzcode/strftime.c b/libc/tzcode/strftime.c
index 1164a13..2a1db64 100644
--- a/libc/tzcode/strftime.c
+++ b/libc/tzcode/strftime.c
@@ -37,7 +37,12 @@ static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
#include "fcntl.h"
#include "locale.h"
#include <ctype.h>
+#if defined(__LP64__)
+#define time64_t time_t
+#define mktime64 mktime
+#else
#include <time64.h>
+#endif
#include "private/bionic_time.h" /* for strftime_tz */
/* struct lc_time_T is now defined as strftime_locale