From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 26 Apr 2012 23:45:25 +0200 Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibc Selection of the BSD variant of struct tcphdr/udphdr on uClibc fails because of config.h. This is caused by config.h setting _GNU_SOURCE and the compat handling (uClibc doesn't have inet6_rth_*) including sys/types.h which in term includes features.h, which figures out what bsd/gnu/posix variant to use because of: /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX. */ #if defined _BSD_SOURCE && \ !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \ defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \ defined _GNU_SOURCE || defined _SVID_SOURCE) # define __FAVOR_BSD 1 #endif The current workaround of undefining _GNU_SOURCE after config.h doesn't work as features.h has already been evaluated by then. Instead, simply don't include config.h as it isn't needed in these two files. Signed-off-by: Peter Korsgaard --- src/trace-tcp.c | 5 ----- src/trace-udp.c | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/trace-tcp.c b/src/trace-tcp.c index 6a7732d..91b64c2 100644 --- a/src/trace-tcp.c +++ b/src/trace-tcp.c @@ -17,11 +17,6 @@ * along with this program. If not, see . * *************************************************************************/ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef _GNU_SOURCE #define _BSD_SOURCE 1 #include diff --git a/src/trace-udp.c b/src/trace-udp.c index 821c24c..1754338 100644 --- a/src/trace-udp.c +++ b/src/trace-udp.c @@ -17,11 +17,6 @@ * along with this program. If not, see . * *************************************************************************/ -#ifdef HAVE_CONFIG_H -# include -#endif - -#undef _GNU_SOURCE #define _BSD_SOURCE 1 #include -- 1.7.10