summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-02-08 18:49:06 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-02-08 18:49:06 +0100
commit99aa181ebcee3f6ae4f8eb83c719cc64cc5a09ec (patch)
treee96c33b85abea027fb67cb5bab5ff6117e4c9b18 /net.c
parent7ba8e72bb56243b8a7df949cef8a7d6039d889ac (diff)
downloadstrace-99aa181ebcee3f6ae4f8eb83c719cc64cc5a09ec.tar.gz
strace-99aa181ebcee3f6ae4f8eb83c719cc64cc5a09ec.tar.bz2
strace-99aa181ebcee3f6ae4f8eb83c719cc64cc5a09ec.tar.xz
If we are on a glibc system, assume it's at least glibc 2.1
It is not likely anyone uses glibc older that that: glibc 2.1.1 was released in 1999 * net.c: Remove test for glibc >= 2.1. * signal.c: Remove code which is compiled only for glibc < 2.1. * util.c: Likewise. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net.c b/net.c
index 2911c73..fbdfe63 100644
--- a/net.c
+++ b/net.c
@@ -50,13 +50,13 @@
#include <arpa/inet.h>
#include <net/if.h>
#include <asm/types.h>
-#if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
+#if defined(__GLIBC__)
# include <netipx/ipx.h>
#else
# include <linux/ipx.h>
#endif
-#if defined(__GLIBC__) && (((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)) || defined(HAVE_SIN6_SCOPE_ID_LINUX))
+#if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX)
# if defined(HAVE_LINUX_IN6_H)
# if defined(HAVE_SIN6_SCOPE_ID_LINUX)
# undef in6_addr