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 <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
index ca76794d6d2d57738df2a2a3aaaf8c38bb0e8adb..ef01aec9f1c5591a32deda00a6142dcb8f441709 100644 (file)
--- 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)