From 2991f7709973fdcc2c0b83bbe15dda3f1ceae9b3 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 13 Jul 2016 12:36:21 +0200 Subject: [PATCH] tevent: avoid -Wtautological-compare errors with gcc6 We expect these macros to generate tautological compares intentionally, so disabling the warning is just fine. This lets --picky-developer work with gcc6 and newer. Pair-Programmed-With: Ira Cooper Signed-off-by: Ira Cooper Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/tevent/tevent_util.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/tevent/tevent_util.h b/lib/tevent/tevent_util.h index e2cdbb8d385..eb7586fd356 100644 --- a/lib/tevent/tevent_util.h +++ b/lib/tevent/tevent_util.h @@ -79,6 +79,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; \ @@ -90,6 +93,7 @@ do { \ if ((p)->next) (p)->next->prev = (p)->prev; \ } \ if ((p) != (list)) (p)->next = (p)->prev = NULL; \ + _Pragma ("GCC diagnostic pop") \ } while (0) /* @@ -120,7 +124,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) -- 2.47.3