Merge branch 'master' of github.com:open-mpi/ompi

config/ompi_setup_java.m4

@@ -89,6 +89,8 @@ AC_DEFUN([OMPI_SETUP_JAVA_BINDINGS],[
            AC_MSG_WARN([*** the Java MPI bindings in Open MPI is contingent])
            AC_MSG_WARN([*** upon user interest and developer support.])
            AC_MSG_WARN([******************************************************])
+           CFLAGS="$CFLAGS -D_REENTRANT"
+           CPPFLAGS="$CPPFLAGS -D_REENTRANT"
           ])
 
     AC_CONFIG_FILES([

opal/mca/shmem/mmap/shmem_mmap_module.c

@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -11,7 +12,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
+ * Copyright (c) 2010-2014 Los Alamos National Security, LLC.
  *                         All rights reserved.
  *
  * $COPYRIGHT$
@@ -501,8 +502,7 @@ segment_attach(opal_shmem_ds_t *ds_buf)
     pid_t my_pid = getpid();
 
     if (my_pid != ds_buf->seg_cpid) {
-        if (-1 == (ds_buf->seg_id = open(ds_buf->seg_name, O_CREAT | O_RDWR,
-                                         0600))) {
+        if (-1 == (ds_buf->seg_id = open(ds_buf->seg_name, O_RDWR))) {
             int err = errno;
             char hn[MAXHOSTNAMELEN];
             gethostname(hn, MAXHOSTNAMELEN - 1);