un-re-un-export net_ConvertIPv4

(it's obsolete and not used by any module anyway)

diff --git a/include/network.h b/include/network.h
index efff190a1e0b0a4d9e238283d8a1ee5d7d10e28f..4661d0f7aec5028f9c771deade5cd1a460082878 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -273,8 +273,6 @@ static inline char *vlc_b64_encode( char *src )
 #define net_OpenTCP(a, b, c) __net_OpenTCP(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
 
-VLC_EXPORT( int, net_ConvertIPv4, ( uint32_t *p_addr, const char * psz_address ) );
-
 #define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
 

diff --git a/src/misc/net.c b/src/misc/net.c
index 7f8e6fad4ad71e1337b30f27de72ccfa0872dfaa..d5910be145ae5e0dec1026d372570273904e7bcd 100644 (file)
--- a/src/misc/net.c
+++ b/src/misc/net.c
@@ -81,8 +81,9 @@ static int SocksHandshakeTCP( vlc_object_t *,
  * net_ConvertIPv4:
  *****************************************************************************
  * Open a TCP connection and return a handle
+ * FIXME: not thread-safe, should use vlc_getaddrinfo instead
  *****************************************************************************/
-int net_ConvertIPv4( uint32_t *p_addr, const char * psz_address )
+static int net_ConvertIPv4( uint32_t *p_addr, const char * psz_address )
 {
     /* Reset struct */
     if( !*psz_address )