Commit fe1fdaf5 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Simplify AI_NUMERICSERV usage

parent 3527f69d
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
# include <ws2tcpip.h> # include <ws2tcpip.h>
# define ENETUNREACH WSAENETUNREACH # define ENETUNREACH WSAENETUNREACH
# define net_errno (WSAGetLastError()) # define net_errno (WSAGetLastError())
# define AI_NUMERICSERV 0
extern const char *net_strerror( int val ); extern const char *net_strerror( int val );
struct iovec struct iovec
...@@ -274,9 +273,8 @@ struct addrinfo ...@@ -274,9 +273,8 @@ struct addrinfo
# define AI_NUMERICHOST 4 # define AI_NUMERICHOST 4
# endif /* if !HAVE_STRUCT_ADDRINFO */ # endif /* if !HAVE_STRUCT_ADDRINFO */
/* Mac OS X doesn't define that one */
#ifndef AI_NUMERICSERV #ifndef AI_NUMERICSERV
#define AI_NUMERICSERV 0 # define AI_NUMERICSERV 0
#endif #endif
VLC_EXPORT( const char *, vlc_gai_strerror, ( int ) ); VLC_EXPORT( const char *, vlc_gai_strerror, ( int ) );
......
...@@ -591,9 +591,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, ...@@ -591,9 +591,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
AI_PASSIVE | AI_PASSIVE |
AI_CANONNAME | AI_CANONNAME |
AI_NUMERICHOST | AI_NUMERICHOST |
#ifdef AI_NUMERICSERV
AI_NUMERICSERV | AI_NUMERICSERV |
#endif
#ifdef AI_ALL #ifdef AI_ALL
AI_ALL | AI_ALL |
#endif #endif
...@@ -615,10 +613,8 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, ...@@ -615,10 +613,8 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
hints.ai_flags = p_hints->ai_flags & safe_flags; hints.ai_flags = p_hints->ai_flags & safe_flags;
} }
#ifdef AI_NUMERICSERV
/* We only ever use port *numbers* */ /* We only ever use port *numbers* */
hints.ai_flags |= AI_NUMERICSERV; hints.ai_flags |= AI_NUMERICSERV;
#endif
if( hints.ai_family == AF_UNSPEC ) if( hints.ai_family == AF_UNSPEC )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment