buildroot
Public
Source
committed 6ea07d5286cFrom 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001From: Peter Korsgaard <jacmet@sunsite.dk>Date: Thu, 26 Apr 2012 23:45:25 +0200Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibcSelection of the BSD variant of struct tcphdr/udphdr on uClibc failsbecause of config.h. This is caused by config.h setting _GNU_SOURCEand the compat handling (uClibc doesn't have inet6_rth_*) includingsys/types.h which in term includes features.h, which figures outwhat 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 #endifThe current workaround of undefining _GNU_SOURCE after config.h doesn'twork as features.h has already been evaluated by then. Instead, simplydon't include config.h as it isn't needed in these two files.Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>--- 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.cindex 6a7732d..91b64c2 100644--- a/src/trace-tcp.c+++ b/src/trace-tcp.c@@ -17,11 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * *************************************************************************/-#ifdef HAVE_CONFIG_H-# include <config.h>-#endif--#undef _GNU_SOURCE #define _BSD_SOURCE 1 #include <string.h>diff --git a/src/trace-udp.c b/src/trace-udp.cindex 821c24c..1754338 100644--- a/src/trace-udp.c+++ b/src/trace-udp.c@@ -17,11 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * *************************************************************************/-#ifdef HAVE_CONFIG_H-# include <config.h>-#endif--#undef _GNU_SOURCE #define _BSD_SOURCE 1 #include <string.h>-- 1.7.10