generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the non-standard time64 stuff for LP64.

Browse Source 
We need a workaround in strftime as long as we still need to support
64-bit times on LP32.

Change-Id: I8ffb616f6312d4063fb9ea3c36b52653e8f4c5f8
This commit is contained in:
Elliott Hughes 2014-05-05 17:14:02 -07:00
parent 629d892d0b
commit 52defb7c70
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libc/include/time64.h
View File

@ -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

5
libc/tzcode/strftime.c
View File

@ -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