Simplify AI_NUMERICSERV usage

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 972090dd1e9d65c185ed95dfd004b47e274a9e7b..363f5e9b4bb7c46670f1e6cce0ba8e20120e70fa 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -40,7 +40,6 @@
 #   include <ws2tcpip.h>
 #   define ENETUNREACH WSAENETUNREACH
 #   define net_errno (WSAGetLastError())
-#   define AI_NUMERICSERV 0
 extern const char *net_strerror( int val );
 
 struct iovec
@@ -274,9 +273,8 @@ struct addrinfo
 #  define AI_NUMERICHOST 4
 # endif /* if !HAVE_STRUCT_ADDRINFO */
 
-/* Mac OS X doesn't define that one */
 #ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV 0
+# define AI_NUMERICSERV 0
 #endif
 
 VLC_EXPORT( const char *, vlc_gai_strerror, ( int ) );

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 4294bce83f8c45dcd3a0c13b3cf9ad028499295f..b57f8caf191196d409aa60891f8c7da5957b350b 100644 (file)
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -591,9 +591,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
             AI_PASSIVE |
             AI_CANONNAME |
             AI_NUMERICHOST |
-#ifdef AI_NUMERICSERV
             AI_NUMERICSERV |
-#endif
 #ifdef AI_ALL
             AI_ALL |
 #endif
@@ -615,10 +613,8 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
         hints.ai_flags = p_hints->ai_flags & safe_flags;
     }
 
-#ifdef AI_NUMERICSERV
     /* We only ever use port *numbers* */
     hints.ai_flags |= AI_NUMERICSERV;
-#endif
 
     if( hints.ai_family == AF_UNSPEC )
     {