mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
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 <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Fri Feb 26 07:11:29 CET 2016 on sn-devel-144
This commit is contained in:
parent
a06bbf3447
commit
00f7d18304
@ -24,8 +24,6 @@
|
|||||||
#include "system/locale.h"
|
#include "system/locale.h"
|
||||||
|
|
||||||
#include <talloc.h>
|
#include <talloc.h>
|
||||||
/* Allow use of deprecated function tevent_loop_allow_nesting() */
|
|
||||||
#define TEVENT_DEPRECATED
|
|
||||||
#include <tevent.h>
|
#include <tevent.h>
|
||||||
#include <tdb.h>
|
#include <tdb.h>
|
||||||
|
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
|
|
||||||
#include <popt.h>
|
#include <popt.h>
|
||||||
#include <talloc.h>
|
#include <talloc.h>
|
||||||
/* Allow use of deprecated function tevent_loop_allow_nesting() */
|
|
||||||
#define TEVENT_DEPRECATED
|
|
||||||
#include <tevent.h>
|
#include <tevent.h>
|
||||||
#include <tdb.h>
|
#include <tdb.h>
|
||||||
|
|
||||||
|
@ -78,9 +78,6 @@ def set_options(opt):
|
|||||||
|
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
|
|
||||||
# CTDB relies on nested event loops
|
|
||||||
conf.env.TEVENT_DEPRECATED = 1
|
|
||||||
|
|
||||||
# No need to build python bindings for talloc/tevent/tdb
|
# No need to build python bindings for talloc/tevent/tdb
|
||||||
if conf.IN_LAUNCH_DIR():
|
if conf.IN_LAUNCH_DIR():
|
||||||
conf.env.standalone_ctdb = True
|
conf.env.standalone_ctdb = True
|
||||||
|
Loading…
Reference in New Issue
Block a user