uv-common.c in libuv-1.0.0

- old
+ new

@@ -33,11 +33,11 @@
 #include <assert.h>
 #include <stddef.h> /* NULL */
 #include <stdlib.h> /* malloc */
 #include <string.h> /* memset */
 
-#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS) && !defined(_WIN32)
+#if !defined(_WIN32)
 # include <net/if.h> /* if_nametoindex */
 #endif
 
 /* EAI_* constants. */
 #if !defined(_WIN32)
@@ -105,21 +105,18 @@
   return uv_inet_pton(AF_INET, ip, &(addr->sin_addr.s_addr));
 }
 
 
 int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr) {
-#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS)
   char address_part[40];
   size_t address_part_size;
   const char* zone_index;
-#endif
 
   memset(addr, 0, sizeof(*addr));
   addr->sin6_family = AF_INET6;
   addr->sin6_port = htons(port);
 
-#if defined(UV_PLATFORM_HAS_IP6_LINK_LOCAL_ADDRESS)
   zone_index = strchr(ip, '%');
   if (zone_index != NULL) {
     address_part_size = zone_index - ip;
     if (address_part_size >= sizeof(address_part))
       address_part_size = sizeof(address_part) - 1;
@@ -134,11 +131,10 @@
     addr->sin6_scope_id = atoi(zone_index);
 #else
     addr->sin6_scope_id = if_nametoindex(zone_index);
 #endif
   }
-#endif
 
   return uv_inet_pton(AF_INET6, ip, &addr->sin6_addr);
 }
 
 
@@ -382,10 +378,10 @@
 void uv_stop(uv_loop_t* loop) {
   loop->stop_flag = 1;
 }
 
 
-uint64_t uv_now(uv_loop_t* loop) {
+uint64_t uv_now(const uv_loop_t* loop) {
   return loop->time;
 }
 
 
 int uv__getaddrinfo_translate_error(int sys_err) {