cedric pushed a commit to branch master.
commit 766d1d178884c8f33c14170ff0c14cefbb2ae31d
Author: Cedric Bail <[email protected]>
Date: Mon Sep 2 05:40:45 2013 +0200
evil: fix compilation for Windows >= Vista and gcc 4.8.1.
---
src/lib/evil/evil_inet.c | 5 ++++-
src/lib/evil/evil_inet.h | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/lib/evil/evil_inet.c b/src/lib/evil/evil_inet.c
index c493833..c24ebaf 100644
--- a/src/lib/evil/evil_inet.c
+++ b/src/lib/evil/evil_inet.c
@@ -22,6 +22,8 @@
* * modification of the management of the error
*/
+#if ! _WIN32_WINNT >= _WIN32_WINNT_VISTA
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif /* HAVE_CONFIG_H */
@@ -467,7 +469,6 @@ evil_inet_pton(int af, const char *src, void *dst)
return (result > -1 ? 1 : -1);
}
-
/* const char *
* inet_ntop4(src, dst, size)
* format an IPv4 address, more or less like inet_ntoa()
@@ -643,3 +644,5 @@ const char *evil_inet_ntop(int af, const char *src, void
*dst, size_t size)
return NULL;
return result;
}
+
+#endif
diff --git a/src/lib/evil/evil_inet.h b/src/lib/evil/evil_inet.h
index 56eebda..f8ff49b 100644
--- a/src/lib/evil/evil_inet.h
+++ b/src/lib/evil/evil_inet.h
@@ -18,6 +18,9 @@
#define __EVIL_INET_H__
+#if ! _WIN32_WINNT >= _WIN32_WINNT_VISTA
+
+
/**
* @file evil_inet.h
* @brief The file that provides functions ported from Unix in arpa/inet.h.
@@ -141,6 +144,8 @@ EAPI const char *evil_inet_ntop(int af, const char *src,
void *dst, size_t size)
#define inet_ntop(x,y,z,s) evil_inet_ntop(x,y,z,s)
+#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */
+
/**
* @}
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
