diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-10-08 19:59:10 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-31 03:46:40 +0100 |
| commit | d558281205a9a3c29cd10fdf94284caf37067fb7 (patch) | |
| tree | 3b980ce52b68a57fd361d79aadbf4eecd799195a /ctdb/include/internal | |
| parent | 94f248d1cc33f368f1f53e6147745e7788c795d0 (diff) | |
| download | samba-d558281205a9a3c29cd10fdf94284caf37067fb7.tar.gz samba-d558281205a9a3c29cd10fdf94284caf37067fb7.tar.xz samba-d558281205a9a3c29cd10fdf94284caf37067fb7.zip | |
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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Oct 31 03:46:40 CET 2014 on sn-devel-104
Diffstat (limited to 'ctdb/include/internal')
| -rw-r--r-- | ctdb/include/internal/includes.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h index 7ffe7d97d0..6c00c037d6 100644 --- a/ctdb/include/internal/includes.h +++ b/ctdb/include/internal/includes.h @@ -1,23 +1,24 @@ #ifndef _CTDB_INCLUDES_H #define _CTDB_INCLUDES_H +/* 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 "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" +#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 */ |