summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2016-07-14 09:58:28 +0200
committerJeremy Allison <jra@samba.org>2016-07-15 00:54:12 +0200
commita751b978a8953206c251f3f46e1b2c53393b6118 (patch)
tree4fba71e06e7fe6eb0337f82923d79b41fe43b7d8 /lib
parentff5521838a474d6ff9489bb92438797db65671a6 (diff)
downloadsamba-a751b978a8953206c251f3f46e1b2c53393b6118.tar.gz
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 <obnox@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/util/dlinklist.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index bdd4f9c9480..8a1b84d4429 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)