Commit 55dd2eac authored by Pekka Pessi's avatar Pekka Pessi

win32 fixes

Changes in iptsec/auth_common.c, test_nua_params.c, nua/test_register.c,
nua/test_sip_events.c, sres.c, win32/unistd.h.

darcs-hash:20060920172942-65a35-4c3dace501734da7cb6932981461ff49b68337d1.gz
parent 5b9d01f1
......@@ -38,12 +38,9 @@
#include <stdarg.h>
#include <assert.h>
#include <sofia-sip/su_md5.h>
#include "sofia-sip/auth_digest.h"
#include "sofia-sip/auth_common.h"
#include "sofia-sip/msg_header.h"
#include "iptsec_debug.h"
static inline int has_token(char const *qstring, char const *token);
/**
......
......@@ -355,7 +355,8 @@ int test_nua_params(struct context *ctx)
TEST_S(m_display, "Joe");
TEST_S(m_username, "joe");
TEST_S(m_params, "user=phone");
TEST_S(m_features, "language=\"en\"");
{ char const *expect_m_features = "language=\"en\"";
TEST_S(m_features, expect_m_features); }
TEST_S(outbound, "foo");
TEST_S(url_as_string(tmphome, registrar->us_url),
......
......@@ -159,7 +159,9 @@ int test_register(struct context *ctx)
TEST(e->data->e_status, 200);
TEST_1(sip = sip_object(e->data->e_msg));
TEST_1(sip->sip_contact);
TEST_S(sip->sip_contact->m_display, "\"A&A\"");
{ char const *expect_m_display = "\"A&A\"";
/* VC does not dig \" with TEST_S() */
TEST_S(sip->sip_contact->m_display, expect_m_display); }
TEST_S(sip->sip_contact->m_url->url_user, "a");
TEST(sip->sip_cseq->cs_seq, 14);
......
......@@ -37,6 +37,11 @@
#include <sofia-sip/su_tag_class.h>
#include <sofia-sip/nea.h>
#if !HAVE_MEMMEM
void *memmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen);
#endif
#if HAVE_FUNC
#elif HAVE_FUNCTION
#define __func__ __FUNCTION__
......
......@@ -65,6 +65,9 @@ typedef unsigned _int32 uint32_t;
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#include <ws2tcpip.h>
#ifndef IPPROTO_IPV6 /* socklen_t is used with @RFC2133 API */
typedef int socklen_t;
#endif
#endif
#include <time.h>
......
......@@ -26,6 +26,7 @@
#include <io.h>
#include <fcntl.h>
#include <stdio.h>
#define write(fd, buf, len) _write((fd), (buf), (len))
#define read(fd, buf, len) _read((fd), (buf), (len))
......
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