The branch, master has been updated
via a6ee401 build: avoid -Wtautological-compare errors from gcc6+ by
disabling it globally
via a751b97 Revert "lib:dlinklist: avoid -Wtautological-compare errors
with gcc6"
via ff55218 Revert "tevent: avoid -Wtautological-compare errors with
gcc6"
via f061ccc Revert "ldb:dlinklist: avoid -Wtautological-compare errors
with gcc6"
from 91a17e5 tdb: Don't malloc for every record in traverse
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a6ee40194995617d6f08f050d6b044d80bfab19c
Author: Michael Adam <[email protected]>
Date: Thu Jul 14 10:01:15 2016 +0200
build: avoid -Wtautological-compare errors from gcc6+ by disabling it
globally
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Jul 15 04:31:27 CEST 2016 on sn-devel-144
commit a751b978a8953206c251f3f46e1b2c53393b6118
Author: Michael Adam <[email protected]>
Date: Thu Jul 14 09:58:28 2016 +0200
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 <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit ff5521838a474d6ff9489bb92438797db65671a6
Author: Michael Adam <[email protected]>
Date: Thu Jul 14 09:58:15 2016 +0200
Revert "tevent: avoid -Wtautological-compare errors with gcc6"
This reverts commit 2991f7709973fdcc2c0b83bbe15dda3f1ceae9b3.
Breaks compile for older (<= 4.4) gccs.
Needs to be done differently.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit f061cccd0a806c949142bf74ab5af957e2d3a5cf
Author: Michael Adam <[email protected]>
Date: Thu Jul 14 09:57:32 2016 +0200
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 <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 1 +
lib/ldb/include/dlinklist.h | 8 --------
lib/tevent/tevent_util.h | 8 --------
lib/util/dlinklist.h | 8 --------
4 files changed, 1 insertion(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 09ce218..5f35d77 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -725,6 +725,7 @@ int main(void) {
if Options.options.picky_developer:
conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror
-Wno-error=deprecated-declarations', testflags=True)
+ conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS',
'-Wno-error=tautological-compare', testflags=True)
if Options.options.fatal_errors:
conf.ADD_CFLAGS('-Wfatal-errors', testflags=True)
diff --git a/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
index ca76794..ef01aec 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)
diff --git a/lib/tevent/tevent_util.h b/lib/tevent/tevent_util.h
index eb7586f..e2cdbb8 100644
--- a/lib/tevent/tevent_util.h
+++ b/lib/tevent/tevent_util.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)
diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index bdd4f9c..8a1b84d 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)
--
Samba Shared Repository
