From 319a41ed84fbcfe6f5fbd175e8553cf25ba9710c Mon Sep 17 00:00:00 2001 From: pasky Date: Mon, 28 Feb 2005 22:33:31 +0000 Subject: [PATCH] (svn r1916) Fix compilation on the glibc-2.2 systems. Part of the inspiration comes from patch 1149710 by Mr. Nobody. Also fixes the comment describing what to do if one's system doesn't have ifaddrs.h. --- network_core.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/network_core.h b/network_core.h index ef2d89a702..7ca53a9444 100644 --- a/network_core.h +++ b/network_core.h @@ -61,25 +61,27 @@ typedef struct ifreq IFREQ; # include # include # include -# if !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__) +// According to glibc/NEWS, appeared in glibc-2.3. +# if !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__) \ + && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) +// If for any reason ifaddrs.h does not exist on your system, comment out +// the following two lines and an alternative way will be used to fetch +// the list of IPs from the system. # include -// If for any reason ifaddrs.h does not exist on a system, remove define below -// and an other system will be used to fetch ips from the system # define HAVE_GETIFADDRS -# else +# endif +# if defined(SUNOS) || defined(__MORPHOS__) || defined(__BEOS__) # define INADDR_NONE 0xffffffff -# endif // SUNOS +# endif # if defined(__BEOS__) && !defined(BEOS_NET_SERVER) // needed on Zeta # include # endif # endif // BEOS_NET_SERVER -/* GLibc 2.1 does not support GetIfAddr() */ -# if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 1) -# undef HAVE_GETIFADDRS +# if defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1) typedef uint32_t in_addr_t; -# endif /* __GLIBC__ && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 1) */ +# endif # include # include