projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SRU diagnostic 62: "Cannot process or store record, insufficent space"
[yaz-moved-to-github.git]
/
src
/
tcpip.c
diff --git
a/src/tcpip.c
b/src/tcpip.c
index
45b2ad1
..
6b7ec9e
100644
(file)
--- a/
src/tcpip.c
+++ b/
src/tcpip.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.30 2006-09-15 09:06:28 adam Exp $
+ * $Id: tcpip.c,v 1.32 2006-10-13 11:22:26 adam Exp $
*/
/**
* \file tcpip.c
*/
/**
* \file tcpip.c
@@
-26,10
+26,17
@@
#endif
#ifdef WIN32
#endif
#ifdef WIN32
+
+/* VS 2003 or later has getaddrinfo; older versions do not */
#include <winsock2.h>
#include <winsock2.h>
+#if _MSC_VER >= 1300
#include <ws2tcpip.h>
#define HAVE_GETADDRINFO 1
#else
#include <ws2tcpip.h>
#define HAVE_GETADDRINFO 1
#else
+#define HAVE_GETADDRINFO 0
+#endif
+
+#else
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
@@
-565,7
+572,7
@@
static int tcpip_bind(COMSTACK h, void *address, int mode)
#ifdef WIN32
BOOL one = 1;
#else
#ifdef WIN32
BOOL one = 1;
#else
- unsigned long one = 1;
+ int one = 1;
#endif
#if HAVE_GETADDRINFO
#endif
#if HAVE_GETADDRINFO