diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-06 01:53:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-06 01:53:53 +0000 |
| commit | 4356adc3f46707b2664576857d7f4d8d6b0a81e2 (patch) | |
| tree | f392cbb7cee51948dabbebc8baf3793600f9b61a | |
| parent | 629d892d0b5ec061b5260453d72fa54ab3d7ce37 (diff) | |
| parent | 52defb7c702306d4e81c7089cbadd7a6da1d7b6b (diff) | |
| download | android_bionic-4356adc3f46707b2664576857d7f4d8d6b0a81e2.tar.gz android_bionic-4356adc3f46707b2664576857d7f4d8d6b0a81e2.tar.bz2 android_bionic-4356adc3f46707b2664576857d7f4d8d6b0a81e2.zip | |
Merge "Remove the non-standard time64 stuff for LP64."
| -rw-r--r-- | libc/include/time64.h | 7 | ||||
| -rw-r--r-- | libc/tzcode/strftime.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libc/include/time64.h b/libc/include/time64.h index b4f128053..905669d98 100644 --- a/libc/include/time64.h +++ b/libc/include/time64.h @@ -33,12 +33,7 @@ Modified for Bionic by the Android Open Source Project #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 diff --git a/libc/tzcode/strftime.c b/libc/tzcode/strftime.c index 1164a13be..2a1db6422 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 |