From ac5ca1d3cbb51488bb437d7014f7134745a983a4 Mon Sep 17 00:00:00 2001
From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 29 Jun 2018 15:55:49 +1000
Subject: [PATCH] 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)
---
 ctdb/server/ctdb_cluster_mutex.c        | 4 ++--
 ctdb/server/ipalloc.c                   | 4 ++--
 ctdb/tests/src/ctdb_takeover_tests.c    | 6 +++---
 ctdb/tests/src/ipalloc_read_known_ips.c | 4 ++--
 ctdb/tools/ctdb_killtcp.c               | 6 +++---
 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"
 
-- 
2.47.2