The branch, master has been updated via 00f7d18 ctdb: Drop unnecessary defines of TEVENT_DEPRECATED from a06bbf3 vfs_gpfs: Fix compile after change in get_nt_acl_fn
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 00f7d1830436f942b2f748f44fc38d35f2d1c8ee Author: Martin Schwenke <mar...@meltin.net> Date: Wed Feb 24 16:05:34 2016 +1100 ctdb: Drop unnecessary defines of TEVENT_DEPRECATED These have been scattered around the code so that tevent_loop_allow_nesting() can be called. However, only the main daemon and some tests currently use nested event loops. TEVENT_DEPRECATED is already defined in the places where it is needed. Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Amitay Isaacs <ami...@samba.org> Autobuild-Date(master): Fri Feb 26 07:11:29 CET 2016 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: ctdb/client/ctdb_client.c | 2 -- ctdb/tools/ctdb.c | 2 -- ctdb/wscript | 3 --- 3 files changed, 7 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 9f07472..fd70806 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -24,8 +24,6 @@ #include "system/locale.h" #include <talloc.h> -/* Allow use of deprecated function tevent_loop_allow_nesting() */ -#define TEVENT_DEPRECATED #include <tevent.h> #include <tdb.h> diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 9061642..482f5fd 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -26,8 +26,6 @@ #include <popt.h> #include <talloc.h> -/* Allow use of deprecated function tevent_loop_allow_nesting() */ -#define TEVENT_DEPRECATED #include <tevent.h> #include <tdb.h> diff --git a/ctdb/wscript b/ctdb/wscript index 43cbbc9..6dc855f 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -78,9 +78,6 @@ def set_options(opt): def configure(conf): - # CTDB relies on nested event loops - conf.env.TEVENT_DEPRECATED = 1 - # No need to build python bindings for talloc/tevent/tdb if conf.IN_LAUNCH_DIR(): conf.env.standalone_ctdb = True -- Samba Shared Repository