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>

diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index bdd4f9c9480c60b891399e2588c82f42b74cfdd8..8a1b84d44291f26d53340b86a342bc8d92414730 100644 (file)
--- 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)