From fe1fdaf598d73a3cabe417ae85a6132623a10466 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 1 Jun 2008 20:52:20 +0300 Subject: [PATCH] Simplify AI_NUMERICSERV usage --- include/vlc_network.h | 4 +--- src/network/getaddrinfo.c | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/vlc_network.h b/include/vlc_network.h index 972090dd1e..363f5e9b4b 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -40,7 +40,6 @@ # include # 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 4294bce83f..b57f8caf19 100644 --- 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 ) { -- 2.39.2