Skip to content

V
vlc
Commit 4d8f7edd authored by Steve Lhomme's avatar Steve Lhomme
Browse files
Options

compilation fixes for MSVC

parent 19e63771
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
include/network.h
View file @ 4d8f7edd
...@@ -273,6 +273,8 @@ static inline char *vlc_b64_encode( char *src ) ...@@ -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) #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_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) #define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) ); VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
......
src/misc/modules.c
View file @ 4d8f7edd
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
#if defined( WIN32 ) || defined( UNDER_CE ) #if defined( WIN32 ) || defined( UNDER_CE )
/* Avoid name collisions */ /* Avoid name collisions */
# define LoadModule(a,b,c) _LoadModule(a,b,c) # define LoadModule(a,b,c) LoadVlcModule(a,b,c)
#endif #endif
/***************************************************************************** /*****************************************************************************
......
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