The branch, master has been updated via d558281 ctdb-includes: Reorder includes.h more logically via 94f248d ctdb-includes: Remove unused idtree.h via 7fce187 ctdb-includes: Clean up includes.h from f184d12 build: fix check for subunit file when selftest prefix is given
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d558281205a9a3c29cd10fdf94284caf37067fb7 Author: Martin Schwenke <mar...@meltin.net> Date: Wed Oct 8 19:59:10 2014 +1100 ctdb-includes: Reorder includes.h more logically For now replace.h needs to be before tdb.h, since tdb.h needs stdbool.h. This is fixed upstream but not yet in various packaged versions. 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 Oct 31 03:46:40 CET 2014 on sn-devel-104 commit 94f248d1cc33f368f1f53e6147745e7788c795d0 Author: Martin Schwenke <mar...@meltin.net> Date: Wed Oct 8 20:54:22 2014 +1100 ctdb-includes: Remove unused idtree.h Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> commit 7fce187a0dc7b0d53cae1d544a645d6d8d440045 Author: Martin Schwenke <mar...@meltin.net> Date: Mon Aug 18 14:58:53 2014 +1000 ctdb-includes: Clean up includes.h Remove unused #defines. CTDB doesn't use these. _PUBLIC_ is defined in replace.h anyway. Remove unnecessary #includes. Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> ----------------------------------------------------------------------- Summary of changes: ctdb/include/internal/idtree.h | 11 ----------- ctdb/include/internal/includes.h | 36 ++++++++---------------------------- 2 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 ctdb/include/internal/idtree.h Changeset truncated at 500 lines: diff --git a/ctdb/include/internal/idtree.h b/ctdb/include/internal/idtree.h deleted file mode 100644 index d60817a..0000000 --- a/ctdb/include/internal/idtree.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef IDTREE_H -#define IDTREE_H - -struct idr_context *idr_init(TALLOC_CTX *mem_ctx); -int idr_get_new(struct idr_context *idp, void *ptr, int limit); -int idr_get_new_above(struct idr_context *idp, void *ptr, int starting_id, int limit); -int idr_get_new_random(struct idr_context *idp, void *ptr, int limit); -void *idr_find(struct idr_context *idp, int id); -int idr_remove(struct idr_context *idp, int id); - -#endif /* IDTREE_H */ diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h index d167ec7..6c00c03 100644 --- a/ctdb/include/internal/includes.h +++ b/ctdb/include/internal/includes.h @@ -1,44 +1,24 @@ #ifndef _CTDB_INCLUDES_H #define _CTDB_INCLUDES_H -#define HAVE_UNIXSOCKET 1 - +/* Replace must be before broken tdb.h to define bool */ #include "replace.h" -#include "talloc.h" #include "system/wait.h" #include "system/network.h" -#include "tdb.h" -#include "idtree.h" -#include "ctdb_client.h" + +#include <talloc.h> +#include <tdb.h> /* Allow use of deprecated function tevent_loop_allow_nesting() */ #define TEVENT_DEPRECATED /* Saves ctdb from massive churn. */ #define TEVENT_COMPAT_DEFINES 1 - -#include "tevent.h" - -#include "ctdb_logging.h" - -#ifndef _PUBLIC_ -#define _PUBLIC_ -#endif /* _PUBLIC_ */ -#ifndef _NORETURN_ -#define _NORETURN_ -#endif /* _NORETURN_ */ -#ifndef _PURE_ -#define _PURE_ -#endif /* _PURE_ */ - -#ifndef ZERO_STRUCT -#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) -#endif /* ZERO_STRUCT */ - -#ifndef discard_const -#define discard_const(ptr) ((void *)((intptr_t)(ptr))) -#endif +#include <tevent.h> #include "lib/util/debug.h" #include "lib/util/samba_util.h" +#include "ctdb_client.h" +#include "ctdb_logging.h" + #endif /* _CTDB_INCLUDES_H */ -- Samba Shared Repository