Miscellany

From eca5fc310ff65e20c4a3c774dd816eb31ddbdfb0 Mon Sep 17 00:00:00 2001From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= <samuli@openvpn.net>Date: Thu, 26 May 2011 17:18:53 +0300Subject: [PATCH] Fix problems with fixes to socket.c and win32.hMIME-Version: 1.0Content-Type: text/plain; charset=utf-8Content-Transfer-Encoding: 8bitSigned-off-by: Gert Doering <gert@greenie.muc.de>Tested-by: Samuli Seppänen <samuli@openvpn.net>Signed-off-by: Samuli Seppänen <samuli@openvpn.net>--- socket.c |    5 ++--- win32.h  |    2 +- 2 files changed, 3 insertions(+), 4 deletions(-)diff --git a/socket.c b/socket.cindex 3d4801f..b1160d7 100644--- a/socket.c+++ b/socket.c@@ -3157,7 +3157,7 @@ link_socket_write_udp_posix_sendmsg (struct link_socket *sock,  * WSAAddressToString() and WSAStringToAddress() functions  */ -/*+#ifndef _MSC_VER const char * inet_ntop(int af, const void *src, char *dst, socklen_t size) {@@ -3205,8 +3205,7 @@ inet_pton(int af, const char *src, void *dst)   }   return 0; }--*/+#endif  int socket_recv_queue (struct link_socket *sock, int maxsize)diff --git a/win32.h b/win32.hindex 3b26bb1..528af6c 100644--- a/win32.h+++ b/win32.h@@ -272,7 +272,7 @@ char *get_win_sys_path (void);  /* call self in a subprocess */ void fork_to_self (const char *cmdline);-#ifdef _MSV_VER+#ifndef _MSC_VER const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); int inet_pton(int af, const char *src, void *st); #endif-- 1.6.3.3