From: Michael Adam Date: Thu, 14 Jul 2016 07:57:32 +0000 (+0200) Subject: Revert "ldb:dlinklist: avoid -Wtautological-compare errors with gcc6" X-Git-Tag: tdb-1.3.10~397 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f061cccd0a806c949142bf74ab5af957e2d3a5cf;p=thirdparty%2Fsamba.git Revert "ldb:dlinklist: avoid -Wtautological-compare errors with gcc6" This reverts commit 7c9505e651287c5d4747b222af1fda970c562a00. 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/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h index ca76794d6d2..ef01aec9f1c 100644 --- a/lib/ldb/include/dlinklist.h +++ b/lib/ldb/include/dlinklist.h @@ -83,9 +83,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; \ @@ -97,7 +94,6 @@ do { \ if ((p)->next) (p)->next->prev = (p)->prev; \ } \ if ((p) != (list)) (p)->next = (p)->prev = NULL; \ - _Pragma ("GCC diagnostic pop") \ } while (0) /* @@ -128,11 +124,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)