diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-04-03 13:02:14 +0100 |
| commit | 667d5dd0a428a790df5a73d044cf9a8882ee92f8 (patch) | |
| tree | 76291debc380e8d31991c3d2eddcf0add131c7a3 /include/libbb.h | |
| parent | 8782950636f76faa8db0ed8c5d698ab0bd1fbf45 (diff) | |
| parent | d35cbad0efaa57bf7c5280e62825966f7757906a (diff) | |
| download | busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.gz busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.bz2 busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.zip | |
Merge branch 'busybox' into merge
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'include/libbb.h')
| -rw-r--r-- | include/libbb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 15a5a6623..f5b7d8dc7 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -536,7 +536,8 @@ struct BUG_too_small { | |||
| 536 | 536 | ||
| 537 | void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC; | 537 | void parse_datestr(const char *date_str, struct tm *ptm) FAST_FUNC; |
| 538 | time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC; | 538 | time_t validate_tm_time(const char *date_str, struct tm *ptm) FAST_FUNC; |
| 539 | 539 | char *strftime_HHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; | |
| 540 | char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC; | ||
| 540 | 541 | ||
| 541 | int xsocket(int domain, int type, int protocol) FAST_FUNC; | 542 | int xsocket(int domain, int type, int protocol) FAST_FUNC; |
| 542 | void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC; | 543 | void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC; |