From 7466c69c1254c1aa6f3bd73efb948fda9e491f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 6 Aug 2018 19:42:23 +0200
Subject: [PATCH 1/2] fcntl include bugfix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Zoltán Mizsei <zmizsei@extrowerk.com>

(cherry picked from commit open-mpi/ompi@ac3f8a16edd10303d571288912a6732ae0698f9b)
---
 opal/util/stacktrace.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/opal/util/stacktrace.c b/opal/util/stacktrace.c
index e9d8cdb1ee2..afb791e62c8 100644
--- a/opal/util/stacktrace.c
+++ b/opal/util/stacktrace.c
@@ -32,8 +32,12 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_FCNTL_H
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#else
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif
 #endif
 
 #include <string.h>

From fb36ab3c905230b80b9b979fa5d893578a61ece1 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Fri, 24 Aug 2018 17:03:54 +0900
Subject: [PATCH 2/2] test: protect <sys/mount.h> with the HAVE_SYS_MOUNT_H
 macro

Thanks Zoltan Mizsei for bringing this to our attention.

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

(cherry picked from commit open-mpi/ompi@a02be5e91a8aeb02f1a8b224f794652f10c1f2e6)
---
 test/util/opal_path_nfs.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/util/opal_path_nfs.c b/test/util/opal_path_nfs.c
index b5fad7ae3dd..fe5768c00ee 100644
--- a/test/util/opal_path_nfs.c
+++ b/test/util/opal_path_nfs.c
@@ -16,6 +16,8 @@
  * Copyright (c) 2010      IBM Corporation.  All rights reserved.
  * Copyright (c) 2014      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -31,7 +33,9 @@
 #include <dirent.h>
 
 #include <sys/param.h>
+#ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
+#endif
 #ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #endif