From: Martin Willi <martin@revosec.ch>
Date: Thu, 2 Jan 2014 14:20:14 +0000 (+0100)
Subject: windows: Don't redeclare inet_ntop/pton if already defined
X-Git-Tag: 5.2.0dr6~24^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8120b3c33960309fa820cf43d8062b7ab04efe1f;p=thirdparty%2Fstrongswan.git

windows: Don't redeclare inet_ntop/pton if already defined
---

diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index 9ed6f8f11b..235586c537 100644
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -115,12 +115,16 @@ char* strndup(const char *s, size_t n);
 /**
  * Provided via ws2_32
  */
+#ifndef InetNtop
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+#endif
 
 /**
  * Provided via ws2_32
  */
+#ifndef InetPton
 int inet_pton(int af, const char *src, void *dst);
+#endif
 
 /**
  * Provided by printf hook backend