- include <fcntl.h>: Several variables used by fcntl define in this file.

- check if we have member si_fd in siginfo_t before use it.

This commit was SVN r5192.

configure.ac

@@ -974,6 +974,9 @@ AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [
 #include <sys/types.h>
 #include <dirent.h>])
 
+AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
+
+
 # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
 # have both Portland and GNU installed; using pgcc will find GNU's
 # <stdbool.h>, which all it does -- by standard -- is define "bool" to

src/mca/iof/base/iof_base_endpoint.c

@@ -8,9 +8,15 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#else
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
+#endif
+
 #include <netinet/in.h>
 #include "util/output.h"
 #include "mca/rml/rml.h"

src/util/stacktrace.c

@@ -228,8 +228,13 @@ static void ompi_show_stackframe (int signo, siginfo_t * info, void * p)
     }
 #ifdef SIGPOLL
     case SIGPOLL: {
+#ifdef HAVE_SIGINFO_T_SI_FD
         ret = snprintf (tmp, size, "si_band:%ld si_fd:%d\n",
                         info->si_band, info->si_fd);
+#else
+        ret = snprintf (tmp, size, "si_band:%ld\n",
+                        info->si_band);
+#endif
         size -= ret;
         tmp += ret;
         break;