summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2018-06-29 15:55:49 +1000
committerKarolin Seeger <kseeger@samba.org>2018-07-10 10:44:13 +0200
commitac5ca1d3cbb51488bb437d7014f7134745a983a4 (patch)
tree78ae80f67ac0abbf11667d380bce18f70b08e564 /ctdb
parent9974975faccdceddd8f37b75eb39099636685486 (diff)
downloadsamba-ac5ca1d3cbb51488bb437d7014f7134745a983a4.tar.gz
ctdb: Fix build on AIX
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13493 Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> (cherry picked from commit 40a8ab1ce0c1b291af7263da13c25c37cee69670)
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_cluster_mutex.c4
-rw-r--r--ctdb/server/ipalloc.c4
-rw-r--r--ctdb/tests/src/ctdb_takeover_tests.c6
-rw-r--r--ctdb/tests/src/ipalloc_read_known_ips.c4
-rw-r--r--ctdb/tools/ctdb_killtcp.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/ctdb/server/ctdb_cluster_mutex.c b/ctdb/server/ctdb_cluster_mutex.c
index 93977463e0c..804c6d5dd8c 100644
--- a/ctdb/server/ctdb_cluster_mutex.c
+++ b/ctdb/server/ctdb_cluster_mutex.c
@@ -19,11 +19,11 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <tevent.h>
-
#include "replace.h"
#include "system/network.h"
+#include <tevent.h>
+
#include "lib/util/debug.h"
#include "lib/util/time.h"
#include "lib/util/strv.h"
diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index caa50224156..a699c144076 100644
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -19,11 +19,11 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <talloc.h>
-
#include "replace.h"
#include "system/network.h"
+#include <talloc.h>
+
#include "lib/util/debug.h"
#include "common/logging.h"
diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index 951ae5201ef..a0e2f0fe4fa 100644
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -17,12 +17,12 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <assert.h>
-#include <talloc.h>
-
#include "replace.h"
#include "system/network.h"
+#include <assert.h>
+#include <talloc.h>
+
#include "lib/util/debug.h"
#include "protocol/protocol.h"
diff --git a/ctdb/tests/src/ipalloc_read_known_ips.c b/ctdb/tests/src/ipalloc_read_known_ips.c
index 354f7ec4fcd..33d0f940a9d 100644
--- a/ctdb/tests/src/ipalloc_read_known_ips.c
+++ b/ctdb/tests/src/ipalloc_read_known_ips.c
@@ -17,11 +17,11 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <talloc.h>
-
#include "replace.h"
#include "system/network.h"
+#include <talloc.h>
+
#include "lib/util/debug.h"
#include "protocol/protocol.h"
diff --git a/ctdb/tools/ctdb_killtcp.c b/ctdb/tools/ctdb_killtcp.c
index 71b5999b10e..da497d21d57 100644
--- a/ctdb/tools/ctdb_killtcp.c
+++ b/ctdb/tools/ctdb_killtcp.c
@@ -17,12 +17,12 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <talloc.h>
-#include <tevent.h>
-
#include "replace.h"
#include "system/network.h"
+#include <talloc.h>
+#include <tevent.h>
+
#include "lib/util/debug.h"
#include "lib/util/tevent_unix.h"