Commit c3c648b9 authored by Pekka Pessi's avatar Pekka Pessi

stun.c, nth_server.c, test_sresolv.c: removed extra define() checks and #includes

darcs-hash:20070502164216-55b16-ee4ff5b48bd50cd43a9f7e1f3dc5b3713c34df57.gz
parent af1b9514
...@@ -32,19 +32,8 @@ ...@@ -32,19 +32,8 @@
#include "config.h" #include "config.h"
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
#include <assert.h>
#include <sofia-sip/string0.h> #include <sofia-sip/string0.h>
#include <sofia-sip/hostdomain.h> #include <sofia-sip/su.h>
#if !defined(EALREADY) && defined(_WIN32)
#define EALREADY WSAEALREADY
#endif
typedef struct server_s server_t; typedef struct server_s server_t;
...@@ -72,6 +61,13 @@ typedef struct server_s server_t; ...@@ -72,6 +61,13 @@ typedef struct server_s server_t;
#include <sofia-sip/auth_module.h> #include <sofia-sip/auth_module.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
#include <assert.h>
#ifndef UINT32_MAX #ifndef UINT32_MAX
#define UINT32_MAX (0xffffffffU) #define UINT32_MAX (0xffffffffU)
#endif #endif
......
...@@ -1836,9 +1836,7 @@ int test_api_errors(sres_context_t *noctx) ...@@ -1836,9 +1836,7 @@ int test_api_errors(sres_context_t *noctx)
TEST(errno, EFAULT); errno = 0; TEST(errno, EFAULT); errno = 0;
TEST_P(sres_query_sockaddr(res, test_answer, ctx, TEST_P(sres_query_sockaddr(res, test_answer, ctx,
sres_qtype_any, sa), NULL); sres_qtype_any, sa), NULL);
#if defined(EAFNOSUPPORT)
TEST(errno, EAFNOSUPPORT); errno = 0; TEST(errno, EAFNOSUPPORT); errno = 0;
#endif
TEST_P(sres_cached_answers(NULL, sres_qtype_any, "example.com"), NULL); TEST_P(sres_cached_answers(NULL, sres_qtype_any, "example.com"), NULL);
TEST(errno, EFAULT); errno = 0; TEST(errno, EFAULT); errno = 0;
......
...@@ -56,19 +56,10 @@ ...@@ -56,19 +56,10 @@
#include <netinet/tcp.h> #include <netinet/tcp.h>
#endif #endif
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
#if HAVE_OPENSSL #if HAVE_OPENSSL
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#endif #endif
#if !defined(ETIMEDOUT) && defined(_WIN32)
#define ETIMEDOUT WSAETIMEDOUT
#endif
/* Missing socket symbols */ /* Missing socket symbols */
#ifndef SOL_TCP #ifndef SOL_TCP
#define SOL_TCP IPPROTO_TCP #define SOL_TCP IPPROTO_TCP
......
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