More changes for NetBSD. Thanks to Aleksej Saushev for this patch.

This commit was SVN r22680.

orte/mca/notifier/command/notifier_command_module.c

@@ -10,7 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2009      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -24,6 +24,8 @@
 
 #include "orte_config.h"
 
+#include <stdlib.h>
+#include <sys/wait.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef HAVE_STDARG_H

orte/mca/notifier/twitter/notifier_twitter_module.c

@@ -10,7 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2009      Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -31,6 +31,15 @@
 #endif
 #include <stdio.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 #include "opal/util/show_help.h"
 

orte/mca/odls/default/odls_default_module.c

@@ -11,7 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2007      Evergrid, Inc. All rights reserved.
- * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008-2010 Cisco Systems, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -293,12 +293,16 @@ static int odls_default_fork_local_proc(orte_app_context_t* context,
     if (pid == 0) {
         long fd, fdmax = sysconf(_SC_OPEN_MAX);
 
-	if (orte_forward_job_control) {
-	    /* Set a new process group for this child, so that a
-	       SIGSTOP can be sent to it without being sent to the
-	       orted. */
-	    setpgrp();
-	}
+        if (orte_forward_job_control) {
+            /* Set a new process group for this child, so that a
+               SIGSTOP can be sent to it without being sent to the
+               orted. */
+#if defined(__NetBSD__)
+            setpgrp(0, 0);
+#else
+            setpgrp();
+#endif
+        }
         
         /* Setup the pipe to be close-on-exec */
         close(p[0]);

orte/mca/oob/tcp/oob_tcp.h

@@ -11,6 +11,7 @@
  *                         All rights reserved.
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC. 
  *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -26,6 +27,14 @@
 #define _MCA_OOB_TCP_H_
 
 #include "orte_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include "orte/types.h"
 
 #include "opal/mca/base/base.h"

orte/mca/oob/tcp/oob_tcp_addr.h

@@ -9,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -29,6 +30,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

orte/mca/oob/tcp/oob_tcp_ping.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -38,7 +38,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include "opal/opal_socket_errno.h"
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -51,7 +53,9 @@
 #ifndef __WINDOWS__
 #include <signal.h>
 #endif
+
 #include "opal/event/event.h"
+#include "opal/opal_socket_errno.h"
 
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"