[Libguestfs] [PATCH v2 1/2] macOS: Include <rpc/types.h> before <rpc/xdr.h>.

[Richard W.M. Jones]

From: Adam Robinson <adarobin at umich.edu>

The ordering of includes is required on this platform.
---
 daemon/tsk.c            | 2 +-
 daemon/yara.c           | 2 +-
 lib/tsk.c               | 2 +-
 lib/yara.c              | 2 +-
 m4/guestfs-libraries.m4 | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/daemon/tsk.c b/daemon/tsk.c
index ad10d74fe..00a4b04b4 100644
--- a/daemon/tsk.c
+++ b/daemon/tsk.c
@@ -23,8 +23,8 @@
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
-#include <rpc/xdr.h>
 #include <rpc/types.h>
+#include <rpc/xdr.h>
 
 #include "guestfs_protocol.h"
 #include "daemon.h"
diff --git a/daemon/yara.c b/daemon/yara.c
index 0fd09815a..9e7bc9414 100644
--- a/daemon/yara.c
+++ b/daemon/yara.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdbool.h>
-#include <rpc/xdr.h>
 #include <rpc/types.h>
+#include <rpc/xdr.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/lib/tsk.c b/lib/tsk.c
index 09e514bd2..cb1dc94ec 100644
--- a/lib/tsk.c
+++ b/lib/tsk.c
@@ -25,8 +25,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
-#include <rpc/xdr.h>
 #include <rpc/types.h>
+#include <rpc/xdr.h>
 
 #include "guestfs.h"
 #include "guestfs_protocol.h"
diff --git a/lib/yara.c b/lib/yara.c
index edced3be8..27390d153 100644
--- a/lib/yara.c
+++ b/lib/yara.c
@@ -25,8 +25,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
-#include <rpc/xdr.h>
 #include <rpc/types.h>
+#include <rpc/xdr.h>
 
 #include "guestfs.h"
 #include "guestfs_protocol.h"
diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
index 17cf556d9..cbc77a17c 100644
--- a/m4/guestfs-libraries.m4
+++ b/m4/guestfs-libraries.m4
@@ -183,7 +183,8 @@ PKG_CHECK_MODULES([RPC], [libtirpc], [], [
     RPC_CFLAGS=""
     AC_CHECK_HEADER([rpc/xdr.h],[],[
         AC_MSG_ERROR([XDR header files are required])
-    ])
+    ],
+    [#include <rpc/types.h>])
 
     old_LIBS="$LIBS"
     LIBS=""
-- 
2.16.2