We need a workaround in strftime as long as we still need to support
64-bit times on LP32.
Change-Id: I8ffb616f6312d4063fb9ea3c36b52653e8f4c5f8
#if defined(__LP64__)
-/* TODO: remove this when external/chromium_org is fixed. */
-#define time64_t time_t
-#define gmtime64_r gmtime_r
-#define localtime64_r localtime_r
-#define mktime64 mktime
-#define timegm64 timegm
+#error Your time_t is already 64-bit.
#else
#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