diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /libbb/inet_common.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'libbb/inet_common.c')
| -rw-r--r-- | libbb/inet_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/inet_common.c b/libbb/inet_common.c index e031ddf9b..6f585ebd9 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c | |||
| @@ -218,4 +218,4 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric) | |||
| 218 | return xstrdup(name); | 218 | return xstrdup(name); |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | #endif /* CONFIG_FEATURE_IPV6 */ | 221 | #endif /* CONFIG_FEATURE_IPV6 */ |