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

Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""

Browse Source 
This reverts commit f4b34b6c39.

The revert was only meant to apply to the jb-mr1 branch, but accidentally
leaked out into AOSP. This revert-revert gets AOSP master and internal
master back in sync.
This commit is contained in:
Elliott Hughes
2013-01-15 11:12:18 -08:00
parent b09d7d8600
commit acb907fb0d
2 changed files with 93 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libc/private/bionic_time.h
View File

@@ -49,7 +49,12 @@ struct strftime_locale {
const char * date_fmt;
};
extern size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale* lc);
/*
* Note: you should consider these extensions deprecated and use managed code or icu4c instead.
*/
extern size_t strftime_tz(char* s, size_t max, const char* format, const struct tm* tm, const struct strftime_locale* lc);
extern time_t mktime_tz(struct tm* const tmp, char const* tz);
extern void localtime_tz(const time_t* const timep, struct tm* tmp, const char* tz);
#endif /* _BIONIC_STRFTIME_TZ_DECLARED */