Commit 56f453f7 authored by Gildas Bazin's avatar Gildas Bazin

* src/misc/getaddrinfo.c: WinCE implementation + ipv6 support (not tested).

parent bfbe106f
...@@ -487,7 +487,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, ...@@ -487,7 +487,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
{ {
char psz_servbuf[6], *psz_serv; char psz_servbuf[6], *psz_serv;
int i_servlen, i_val; int i_servlen, i_val;
#ifdef WIN32 #if defined( WIN32 ) && !defined( UNDER_CE )
/* /*
* Here is the kind of kludge you need to keep binary compatibility among * Here is the kind of kludge you need to keep binary compatibility among
* varying OS versions... * varying OS versions...
...@@ -509,7 +509,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, ...@@ -509,7 +509,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
psz_serv = NULL; psz_serv = NULL;
i_servlen = 0; i_servlen = 0;
} }
#ifdef WIN32 #if defined( WIN32 ) && !defined( UNDER_CE )
wship6_module = LoadLibrary( "wship6.dll" ); wship6_module = LoadLibrary( "wship6.dll" );
if( wship6_module != NULL ) if( wship6_module != NULL )
{ {
...@@ -530,9 +530,8 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, ...@@ -530,9 +530,8 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
FreeLibrary( wship6_module ); FreeLibrary( wship6_module );
} }
#endif #endif
#if HAVE_GETNAMEINFO #if defined( HAVE_GETNAMEINFO ) || defined( UNDER_CE )
i_val = getnameinfo( sa, salen, host, hostlen, psz_serv, i_servlen, i_val = getnameinfo(sa, salen, host, hostlen, psz_serv, i_servlen, flags);
flags );
#else #else
{ {
# ifdef HAVE_USABLE_MUTEX_THAT_DONT_NEED_LIBVLC_POINTER # ifdef HAVE_USABLE_MUTEX_THAT_DONT_NEED_LIBVLC_POINTER
...@@ -632,7 +631,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, ...@@ -632,7 +631,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
} }
} }
#ifdef WIN32 #if defined( WIN32 ) && !defined( UNDER_CE )
{ {
typedef int (CALLBACK * GETADDRINFO) ( const char *, const char *, typedef int (CALLBACK * GETADDRINFO) ( const char *, const char *,
const struct addrinfo *, const struct addrinfo *,
...@@ -659,7 +658,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, ...@@ -659,7 +658,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
} }
} }
#endif #endif
#if HAVE_GETADDRINFO #if defined( HAVE_GETADDRINFO ) || defined( UNDER_CE )
return getaddrinfo( psz_node, psz_service, &hints, res ); return getaddrinfo( psz_node, psz_service, &hints, res );
#else #else
{ {
...@@ -681,7 +680,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node, ...@@ -681,7 +680,7 @@ int vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
void vlc_freeaddrinfo( struct addrinfo *infos ) void vlc_freeaddrinfo( struct addrinfo *infos )
{ {
#ifdef WIN32 #if defined( WIN32 ) && !defined( UNDER_CE )
typedef void (CALLBACK * FREEADDRINFO) ( struct addrinfo * ); typedef void (CALLBACK * FREEADDRINFO) ( struct addrinfo * );
HINSTANCE wship6_module; HINSTANCE wship6_module;
FREEADDRINFO ws2_freeaddrinfo; FREEADDRINFO ws2_freeaddrinfo;
...@@ -706,7 +705,7 @@ void vlc_freeaddrinfo( struct addrinfo *infos ) ...@@ -706,7 +705,7 @@ void vlc_freeaddrinfo( struct addrinfo *infos )
FreeLibrary( wship6_module ); FreeLibrary( wship6_module );
} }
#endif #endif
#ifdef HAVE_GETADDRINFO #if defined( HAVE_GETADDRINFO ) || defined( UNDER_CE )
freeaddrinfo( infos ); freeaddrinfo( infos );
#else #else
__freeaddrinfo( infos ); __freeaddrinfo( infos );
......
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