diff options
| author | Jeff Olson <olson.jeffery@gmail.com> | 2012-06-26 09:05:02 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-06-29 15:41:56 -0700 |
| commit | 8794815da9b0a3ca78725624048e5901d4fc7aa8 (patch) | |
| tree | ec7293efd28ced473d08e8591e5178c3de595d87 /src/rt | |
| parent | 5014a2a4132fca05c39c34a6584e1a172b9008d6 (diff) | |
rt: get rid of unused helpers for AF_INET and add bool-based ones, instead
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_uv.cpp | 15 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index e47b3585b9c..f681c6bdd99 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -324,18 +324,10 @@ extern "C" size_t rust_uv_helper_addrinfo_size() { return sizeof(addrinfo); } -extern "C" unsigned long int +extern "C" unsigned int rust_uv_helper_get_INADDR_NONE() { return INADDR_NONE; } -extern "C" unsigned long int -rust_uv_helper_get_AF_INET() { - return AF_INET; -} -extern "C" unsigned long int -rust_uv_helper_get_AF_INET6() { - return AF_INET6; -} extern "C" uv_stream_t* rust_uv_get_stream_handle_from_connect_req(uv_connect_t* connect) { @@ -518,9 +510,12 @@ rust_uv_freeaddrinfo(addrinfo* res) { } extern "C" bool rust_uv_is_ipv4_addrinfo(addrinfo* input) { - // if it aint AF_INET, it's AF_INET6 return input->ai_family == AF_INET; } +extern "C" bool +rust_uv_is_ipv6_addrinfo(addrinfo* input) { + return input->ai_family == AF_INET6; +} extern "C" addrinfo* rust_uv_get_next_addrinfo(addrinfo* input) { return input->ai_next; diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index c454f4d496a..2fed7b35685 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -124,6 +124,7 @@ rust_uv_read_stop rust_uv_malloc_buf_base_of rust_uv_free_base_of_buf rust_uv_is_ipv4_addrinfo +rust_uv_is_ipv6_addrinfo rust_uv_get_next_addrinfo rust_uv_addrinfo_as_sockaddr_in rust_uv_addrinfo_as_sockaddr_in6 @@ -138,8 +139,6 @@ rust_uv_helper_addr_in_size rust_uv_helper_addrinfo_size rust_uv_helper_uv_getaddrinfo_t_size rust_uv_helper_get_INADDR_NONE -rust_uv_helper_get_AF_INET -rust_uv_helper_get_AF_INET6 rust_uv_helper_uv_async_t_size rust_uv_helper_uv_timer_t_size rust_uv_get_stream_handle_from_connect_req |