From 7c9505e651287c5d4747b222af1fda970c562a00 Mon Sep 17 00:00:00 2001 From: Ira Cooper Date: Wed, 13 Jul 2016 12:37:19 +0200 Subject: ldb:dlinklist: avoid -Wtautological-compare errors with gcc6 We expect these macros to generate tautological compares intentionally, so disabling the warning is just fine. This lets --pick-developer work with gcc6 and newer. Pair-Programmed-With: Michael Adam Signed-off-by: Michael Adam Signed-off-by: Ira Cooper Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Jul 14 05:44:21 CEST 2016 on sn-devel-144 --- lib/ldb/include/dlinklist.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/ldb') diff --git a/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h index ef01aec9f1c..ca76794d6d2 100644 --- a/lib/ldb/include/dlinklist.h +++ b/lib/ldb/include/dlinklist.h @@ -83,6 +83,9 @@ do { \ */ #define DLIST_REMOVE(list, p) \ do { \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \ + _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \ if ((p) == (list)) { \ if ((p)->next) (p)->next->prev = (p)->prev; \ (list) = (p)->next; \ @@ -94,6 +97,7 @@ do { \ if ((p)->next) (p)->next->prev = (p)->prev; \ } \ if ((p) != (list)) (p)->next = (p)->prev = NULL; \ + _Pragma ("GCC diagnostic pop") \ } while (0) /* @@ -124,7 +128,11 @@ do { \ (p)->next = (el)->next; \ (el)->next = (p); \ if ((p)->next) (p)->next->prev = (p); \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \ + _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \ if ((list)->prev == (el)) (list)->prev = (p); \ + _Pragma ("GCC diagnostic pop") \ }\ } while (0) -- cgit v1.2.1