Commit 9ec4a5fc authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Merge branch 'master' into dev_resolver

parents 2be6cb2c b8da11e8
......@@ -32,8 +32,8 @@ Global
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
{300E2173-D3DA-48BB-9410-7F4E953CE5D1}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|Win32
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|Win32.ActiveCfg = Debug|Win32
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|Win32.Build.0 = Debug|Win32
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|Win32.ActiveCfg = DebugDLL|Win32
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|Win32.Build.0 = DebugDLL|Win32
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|x64.ActiveCfg = Debug|x64
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.Debug|x64.Build.0 = Debug|x64
{0F0FE03A-78F3-4B34-9DCE-0CDFF1FB5C40}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
......
......@@ -74,7 +74,7 @@ static inline int get_socket_error(void){
}
const char *belle_sip_get_socket_error_string();
const char *belle_sip_get_socket_error_string_from_code();
const char *belle_sip_get_socket_error_string_from_code(int code);
#define usleep(us) Sleep((us)/1000)
static inline int inet_aton(const char *ip, struct in_addr *p){
......
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