diff options
author | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-08-04 09:46:24 +0100 |
commit | 64fde14d12cc5e6182f114ecaf4340ec1854c2f6 (patch) | |
tree | 4d2cabca7865dd74e2344834d89503c534fb502c /include/libbb.h | |
parent | 7aabb625005c642d6a30d6d97b51bf183429152e (diff) | |
parent | 16aa7a73c40ba5dfaabaedb8a5533619cb8b6cb6 (diff) | |
download | busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.gz busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.tar.bz2 busybox-w32-64fde14d12cc5e6182f114ecaf4340ec1854c2f6.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index eb53312cd..729704974 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -684,6 +684,7 @@ uint16_t inet_cksum(uint16_t *addr, int len) FAST_FUNC; | |||
684 | 684 | ||
685 | char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC; | 685 | char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC; |
686 | char *xstrndup(const char *s, int n) FAST_FUNC RETURNS_MALLOC; | 686 | char *xstrndup(const char *s, int n) FAST_FUNC RETURNS_MALLOC; |
687 | void *xmemdup(const void *s, int n) FAST_FUNC RETURNS_MALLOC; | ||
687 | void overlapping_strcpy(char *dst, const char *src) FAST_FUNC; | 688 | void overlapping_strcpy(char *dst, const char *src) FAST_FUNC; |
688 | char *safe_strncpy(char *dst, const char *src, size_t size) FAST_FUNC; | 689 | char *safe_strncpy(char *dst, const char *src, size_t size) FAST_FUNC; |
689 | char *strncpy_IFNAMSIZ(char *dst, const char *src) FAST_FUNC; | 690 | char *strncpy_IFNAMSIZ(char *dst, const char *src) FAST_FUNC; |