diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-09-17 11:36:53 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-09-17 11:38:52 +0100 |
| commit | 46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52 (patch) | |
| tree | 6194cdabc0858ae3bed0276679b3b80a722f4150 /include | |
| parent | cf91de46997888b7096352805c05401e7ebae01e (diff) | |
| parent | 9fe1548bbfde548d54acaab113656a56ea0ccc72 (diff) | |
| download | busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.tar.gz busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.tar.bz2 busybox-w32-46299d0c4f4c9a4bbad38bbbe26f196e1bccdc52.zip | |
Merge branch 'busybox' into merge
Disable FEATURE_TIMEZONE for now.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 7a43967cb..cee37f9d8 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -730,7 +730,7 @@ struct BUG_too_small { | |||
| 730 | }; | 730 | }; |
| 731 | 731 | ||
| 732 | 732 | ||
| 733 | void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC; | 733 | int parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC; |
| 734 | time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC; | 734 | time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC; |
| 735 | char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; | 735 | char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; |
| 736 | char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; | 736 | char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; |