From: Michael Adam Date: Thu, 14 Jul 2016 07:58:28 +0000 (+0200) Subject: Revert "lib:dlinklist: avoid -Wtautological-compare errors with gcc6" X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a751b978a8953206c251f3f46e1b2c53393b6118;p=metze%2Fsamba%2Fwip.git Revert "lib:dlinklist: avoid -Wtautological-compare errors with gcc6" This reverts commit 5d85fd85467eb1f8941641d5f71d75e7d5c7234c. Breaks compile for older (<= 4.4) gccs. Needs to be done differently. Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h index bdd4f9c9480c..8a1b84d44291 100644 --- a/lib/util/dlinklist.h +++ b/lib/util/dlinklist.h @@ -79,9 +79,6 @@ 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; \ @@ -93,7 +90,6 @@ do { \ if ((p)->next) (p)->next->prev = (p)->prev; \ } \ if ((p) != (list)) (p)->next = (p)->prev = NULL; \ - _Pragma ("GCC diagnostic pop") \ } while (0) /* @@ -124,11 +120,7 @@ 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)