compilation fixes for MSVC

diff --git a/include/network.h b/include/network.h
index 4661d0f7aec5028f9c771deade5cd1a460082878..efff190a1e0b0a4d9e238283d8a1ee5d7d10e28f 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -273,6 +273,8 @@ 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/modules.c b/src/misc/modules.c
index 22fd2228bfb4e59ea6435cff9def1417244627d0..eb04416e0dc1dfeb847be6a81c48afcddf6c0a99 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -121,7 +121,7 @@
 
 #if defined( WIN32 ) || defined( UNDER_CE )
     /* Avoid name collisions */
-#   define LoadModule(a,b,c) _LoadModule(a,b,c)
+#   define LoadModule(a,b,c) LoadVlcModule(a,b,c)
 #endif
 
 /*****************************************************************************