Commit 1e871a6b authored by Michael Jerris's avatar Michael Jerris

msvc2008

darcs-hash:20080227213431-16063-b9be07d945c93dd41e64ad929de2060c1143bb37.gz
parent ef6441cb
......@@ -1291,7 +1291,7 @@ nua_stack_init_registrations(nua_t *nua)
}
}
nta_agent_bind_tport_update(nua->nua_nta, nua, nua_stack_tport_update);
nta_agent_bind_tport_update(nua->nua_nta, (nta_update_magic_t *)nua, nua_stack_tport_update);
return 0;
}
......
......@@ -1102,6 +1102,7 @@ int nua_invite_client_ack(nua_client_request_t *cr, tagi_t const *tags)
assert(cr->cr_orq);
assert(cr->cr_method == sip_method_invite);
if (!ds->ds_leg) {
/* XXX - fix nua_dialog_usage_remove_at() instead! */
nta_outgoing_destroy(cr->cr_orq);
......
......@@ -141,7 +141,7 @@ int sres_close(sres_socket_t s)
return closesocket(s);
}
#if !defined(IPPROTO_IPV6)
#if !defined(IPPROTO_IPV6) && (_WIN32_WINNT < 0x0600)
#if HAVE_SIN6
#include <tpipv6.h>
#else
......
......@@ -40,6 +40,7 @@
#include <assert.h>
#include <string.h>
#include <time.h>
#include <stdlib.h>
#define SU_ROOT_MAGIC_T struct stun_magic_t
......
......@@ -44,6 +44,7 @@
#include "stun_internal.h"
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#if HAVE_FUNC
......
......@@ -40,6 +40,7 @@
#include <assert.h>
#include <string.h>
#include <stdlib.h>
typedef struct stun_bound_s stun_bound_t;
......
......@@ -67,6 +67,12 @@
#define MSG_NOSIGNAL (0)
#endif
#if (_WIN32_WINNT >= 0x0600)
#ifndef HAVE_MSG_TRUNC
#define HAVE_MSG_TRUNC 1
#endif
#endif
#if !HAVE_MSG_TRUNC
#define MSG_TRUNC (0)
#endif
......
......@@ -317,6 +317,7 @@ int tport_recv_stream(tport_t *self)
if (i + self->tp_ping >= 4)
tport_tcp_pong(self);
else
self->tp_ping += (unsigned short)i;
if (i == iovec->siv_len && veclen == 1) {
......
......@@ -238,7 +238,7 @@ static void tport_check_trunc(tport_t *tp, su_addrinfo_t *ai)
n = su_sendto(tp->tp_socket,
"TEST", 4, 0,
(void *)ai->ai_addr, ai->ai_addrlen);
(void *)ai->ai_addr, (socklen_t)ai->ai_addrlen);
if (n != 4)
return;
......
......@@ -457,7 +457,13 @@
#define strncasecmp _strnicmp
#define snprintf _snprintf
#ifndef _MSC_VER
#define vsnprintf _vsnprintf
#endif
#if _MSC_VER < 1500
#define vsnprintf _vsnprintf
#endif
#define srandom(x) srand((x))
#define random() rand()
......
......@@ -104,7 +104,12 @@
#define snprintf _snprintf
#endif
#ifndef vsnprintf
#define vsnprintf _vsnprintf
#ifndef _MSC_VER
#define vsnprintf _vsnprintf
#endif
#if _MSC_VER < 1500
#define vsnprintf _vsnprintf
#endif
#endif
#define srandom(x) srand((x))
......
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