diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-11 11:18:38 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-09-11 11:18:38 -0700 |
| commit | d03072ffde3279fbb60591a0d07c820d8e792762 (patch) | |
| tree | 089de3b6d24a512b0c94c24026df16a178364fc8 /include | |
| parent | 82959f5e46870cb57675d1ebba97294c56508949 (diff) | |
| download | system_core-d03072ffde3279fbb60591a0d07c820d8e792762.zip system_core-d03072ffde3279fbb60591a0d07c820d8e792762.tar.gz system_core-d03072ffde3279fbb60591a0d07c820d8e792762.tar.bz2 | |
The localtime_tz and mktime_tz extensions are now in bionic.
Bug: 7012465
Change-Id: I5f3d06fe06fad7c3ff6d1950770a30f4f83e56ff
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/tztime.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/include/cutils/tztime.h b/include/cutils/tztime.h index 36ac25d..dbdbd60 100644 --- a/include/cutils/tztime.h +++ b/include/cutils/tztime.h @@ -17,45 +17,8 @@ #ifndef _CUTILS_TZTIME_H #define _CUTILS_TZTIME_H -#include <time.h> - -#ifdef __cplusplus -extern "C" { -#endif - -time_t mktime_tz(struct tm * const tmp, char const * tz); -void localtime_tz(const time_t * const timep, struct tm * tmp, const char* tz); - -#ifdef HAVE_ANDROID_OS - -/* the following is defined in the Bionic C library on Android, but the - * declarations are only available through a platform-private header - */ +// TODO: fix both callers to just include <bionic_time.h> themselves. #include <bionic_time.h> -#else /* !HAVE_ANDROID_OS */ - -struct strftime_locale { - const char *mon[12]; /* short names */ - const char *month[12]; /* long names */ - const char *standalone_month[12]; /* long standalone names */ - const char *wday[7]; /* short names */ - const char *weekday[7]; /* long names */ - const char *X_fmt; - const char *x_fmt; - const char *c_fmt; - const char *am; - const char *pm; - const char *date_fmt; -}; - -size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale *locale); - -#endif /* !HAVE_ANDROID_OS */ - -#ifdef __cplusplus -} -#endif - #endif /* __CUTILS_TZTIME_H */ |