LP64 shouldn't include the non-standard <time64.h> cruft.

This patch includes just enough to keep external/chromium_org building
until they switch 64-bit Android over to using the regular non-Android code.

Change-Id: Iecaf274efa46ae18a42d5e3439c5aa4f909177c1
This commit is contained in:
Elliott Hughes
2014-04-22 13:55:58 -07:00
parent 8eaeaf50cb
commit 8d77bce185
6 changed files with 35 additions and 17 deletions

View File

@@ -31,29 +31,41 @@ Modified for Bionic by the Android Open Source Project
#ifndef TIME64_H
#define TIME64_H
#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
#else
/* Legacy cruft for LP32 where time_t was 32-bit. */
#include <sys/cdefs.h>
#include <time.h>
#include <stdint.h>
__BEGIN_DECLS
typedef int64_t time64_t;
typedef int64_t time64_t;
struct tm *gmtime64_r (const time64_t *, struct tm *);
struct tm *localtime64_r (const time64_t *, struct tm *);
struct tm *gmtime64 (const time64_t *);
struct tm *localtime64 (const time64_t *);
char *asctime64 (const struct tm *);
char *asctime64_r (const struct tm *, char *);
char *ctime64 (const time64_t*);
char *ctime64_r (const time64_t*, char*);
time64_t timegm64 (const struct tm *);
time64_t mktime64 (const struct tm *);
time64_t timelocal64 (const struct tm *);
char* asctime64(const struct tm*);
char* asctime64_r(const struct tm*, char*);
char* ctime64(const time64_t*);
char* ctime64_r(const time64_t*, char*);
struct tm* gmtime64(const time64_t*);
struct tm* gmtime64_r(const time64_t*, struct tm*);
struct tm* localtime64(const time64_t*);
struct tm* localtime64_r(const time64_t*, struct tm*);
time64_t mktime64(const struct tm*);
time64_t timegm64(const struct tm*);
time64_t timelocal64(const struct tm*);
__END_DECLS
#endif
#endif /* TIME64_H */