summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-09-02 05:40:45 +0200
committerCedric Bail <cedric.bail@samsung.com>2013-09-11 15:13:41 +0900
commit766d1d178884c8f33c14170ff0c14cefbb2ae31d (patch)
treee230662090ee614ad071ddfa0e48dc123e6a2a37
parent5290befb53a0ab27a18bea23bb688ecf8624b717 (diff)
evil: fix compilation for Windows >= Vista and gcc 4.8.1.
-rw-r--r--src/lib/evil/evil_inet.c5
-rw-r--r--src/lib/evil/evil_inet.h5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/evil/evil_inet.c b/src/lib/evil/evil_inet.c
index c4938334af..c24ebaf97f 100644
--- a/src/lib/evil/evil_inet.c
+++ b/src/lib/evil/evil_inet.c
@@ -22,6 +22,8 @@
22 * * modification of the management of the error 22 * * modification of the management of the error
23 */ 23 */
24 24
25#if ! _WIN32_WINNT >= _WIN32_WINNT_VISTA
26
25#ifdef HAVE_CONFIG_H 27#ifdef HAVE_CONFIG_H
26# include "config.h" 28# include "config.h"
27#endif /* HAVE_CONFIG_H */ 29#endif /* HAVE_CONFIG_H */
@@ -467,7 +469,6 @@ evil_inet_pton(int af, const char *src, void *dst)
467 return (result > -1 ? 1 : -1); 469 return (result > -1 ? 1 : -1);
468} 470}
469 471
470
471/* const char * 472/* const char *
472 * inet_ntop4(src, dst, size) 473 * inet_ntop4(src, dst, size)
473 * format an IPv4 address, more or less like inet_ntoa() 474 * 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)
643 return NULL; 644 return NULL;
644 return result; 645 return result;
645} 646}
647
648#endif
diff --git a/src/lib/evil/evil_inet.h b/src/lib/evil/evil_inet.h
index 56eebda9b1..f8ff49b17f 100644
--- a/src/lib/evil/evil_inet.h
+++ b/src/lib/evil/evil_inet.h
@@ -18,6 +18,9 @@
18#define __EVIL_INET_H__ 18#define __EVIL_INET_H__
19 19
20 20
21#if ! _WIN32_WINNT >= _WIN32_WINNT_VISTA
22
23
21/** 24/**
22 * @file evil_inet.h 25 * @file evil_inet.h
23 * @brief The file that provides functions ported from Unix in arpa/inet.h. 26 * @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)
141#define inet_ntop(x,y,z,s) evil_inet_ntop(x,y,z,s) 144#define inet_ntop(x,y,z,s) evil_inet_ntop(x,y,z,s)
142 145
143 146
147#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */
148
144 149
145/** 150/**
146 * @} 151 * @}