From 5b12a357c7cdca640114d0842575d5339a14dcdb Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Sun, 17 Apr 2005 17:50:39 +0000
Subject: [PATCH] * make the PTY setup code conform to the prefix rules.  Duh.

This commit was SVN r5410.
---
 src/mca/iof/base/iof_base_setup.c  |  8 ++++----
 src/mca/iof/base/iof_base_setup.h  | 12 ++++++------
 src/mca/pls/fork/pls_fork_module.c |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mca/iof/base/iof_base_setup.c b/src/mca/iof/base/iof_base_setup.c
index 4b0faa468d..0a02bb1cdd 100644
--- a/src/mca/iof/base/iof_base_setup.c
+++ b/src/mca/iof/base/iof_base_setup.c
@@ -44,7 +44,7 @@
 #include "mca/ns/ns.h"
 
 int
-iof_base_setup_prefork(mca_iof_base_io_conf_t *opts)
+orte_iof_base_setup_prefork(orte_iof_base_io_conf_t *opts)
 {
     int ret;
 
@@ -85,7 +85,7 @@ iof_base_setup_prefork(mca_iof_base_io_conf_t *opts)
 
 
 int
-iof_base_setup_child(mca_iof_base_io_conf_t *opts)
+orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts)
 {
     int ret;
 
@@ -123,8 +123,8 @@ iof_base_setup_child(mca_iof_base_io_conf_t *opts)
 
 
 int
-iof_base_setup_parent(const orte_process_name_t* name,
-                      mca_iof_base_io_conf_t *opts)
+orte_iof_base_setup_parent(const orte_process_name_t* name,
+                           orte_iof_base_io_conf_t *opts)
 {
     int ret;
 
diff --git a/src/mca/iof/base/iof_base_setup.h b/src/mca/iof/base/iof_base_setup.h
index 3280c93ab3..ea9820cd1f 100644
--- a/src/mca/iof/base/iof_base_setup.h
+++ b/src/mca/iof/base/iof_base_setup.h
@@ -25,14 +25,14 @@
 
 #include "mca/ns/ns.h"
 
-struct mca_iof_base_io_conf_t {
+struct orte_iof_base_io_conf_t {
     int p_stdin[2];
     int p_stdout[2];
     int p_stderr[2];
 
     int usepty;
 };
-typedef struct mca_iof_base_io_conf_t mca_iof_base_io_conf_t;
+typedef struct orte_iof_base_io_conf_t orte_iof_base_io_conf_t;
 
 
 /**
@@ -41,11 +41,11 @@ typedef struct mca_iof_base_io_conf_t mca_iof_base_io_conf_t;
  * Do all stdio forwarding that must be done before fork() is called.
  * This might include creating pipes or ptys or similar work.
  */
-int iof_base_setup_prefork(mca_iof_base_io_conf_t *opts);
+int orte_iof_base_setup_prefork(orte_iof_base_io_conf_t *opts);
 
-int iof_base_setup_child(mca_iof_base_io_conf_t *opts);
+int orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts);
 
-int iof_base_setup_parent(const orte_process_name_t* name,
-                          mca_iof_base_io_conf_t *opts);
+int orte_iof_base_setup_parent(const orte_process_name_t* name,
+                               orte_iof_base_io_conf_t *opts);
 
 #endif
diff --git a/src/mca/pls/fork/pls_fork_module.c b/src/mca/pls/fork/pls_fork_module.c
index 7eef807b9e..5419add352 100644
--- a/src/mca/pls/fork/pls_fork_module.c
+++ b/src/mca/pls/fork/pls_fork_module.c
@@ -117,14 +117,14 @@ static int orte_pls_fork_proc(
     orte_vpid_t vpid_range)
 {
     pid_t pid;
-    mca_iof_base_io_conf_t opts;
+    orte_iof_base_io_conf_t opts;
     int rc;
 
     /* should pull this information from MPIRUN instead of going with
        default */
     opts.usepty = OMPI_ENABLE_PTY_SUPPORT;
 
-    rc = iof_base_setup_prefork(&opts);
+    rc = orte_iof_base_setup_prefork(&opts);
     if (OMPI_SUCCESS != rc) {
         ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
         return ORTE_ERR_OUT_OF_RESOURCE;
@@ -178,7 +178,7 @@ static int orte_pls_fork_proc(
                             &environ_copy);
 
         /* setup stdout/stderr */
-        iof_base_setup_child(&opts);
+        orte_iof_base_setup_child(&opts);
 
         /* execute application */
         new_env = ompi_environ_merge(context->env, environ_copy);
@@ -211,7 +211,7 @@ static int orte_pls_fork_proc(
         }
 
         /* connect read end to IOF */
-        rc = iof_base_setup_parent(&proc->proc_name, &opts);
+        rc = orte_iof_base_setup_parent(&proc->proc_name, &opts);
         if(ORTE_SUCCESS != rc) {
             ORTE_ERROR_LOG(rc);
             return rc;