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

am e0cbc5da: am 4356adc3: Merge "Remove the non-standard time64 stuff for LP64."

Browse Source 
* commit 'e0cbc5da31a0ebad76a6ca0968e26c200c70b502':
  Remove the non-standard time64 stuff for LP64.
This commit is contained in:
Elliott Hughes 2014-05-06 01:59:16 +00:00 committed by Android Git Automerger
commit 1911676cec
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__) #if defined(__LP64__)
/* TODO: remove this when external/chromium_org is fixed. */ #error Your time_t is already 64-bit.
#define time64_t time_t
#define gmtime64_r gmtime_r
#define localtime64_r localtime_r
#define mktime64 mktime
#define timegm64 timegm
#else #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 "fcntl.h"
#include "locale.h" #include "locale.h"
#include <ctype.h> #include <ctype.h>
#if defined(__LP64__)
#define time64_t time_t
#define mktime64 mktime
#else
#include <time64.h> #include <time64.h>
#endif
#include "private/bionic_time.h" /* for strftime_tz */ #include "private/bionic_time.h" /* for strftime_tz */
/* struct lc_time_T is now defined as strftime_locale /* struct lc_time_T is now defined as strftime_locale