* need to declare environ on OS X
* work around fact that num_env is a size_t. Thankfully, OS X compiler caught this one. This commit was SVN r8180.
Этот коммит содержится в:
родитель
dde38d4119
Коммит
d60c7695d3
@ -49,6 +49,8 @@
|
|||||||
#include "runtime/runtime.h"
|
#include "runtime/runtime.h"
|
||||||
#include "opal/util/printf.h"
|
#include "opal/util/printf.h"
|
||||||
|
|
||||||
|
extern char **environ;
|
||||||
|
|
||||||
int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root,
|
int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root,
|
||||||
orte_process_name_t *port, int send_first,
|
orte_process_name_t *port, int send_first,
|
||||||
ompi_communicator_t **newcomm, orte_rml_tag_t tag )
|
ompi_communicator_t **newcomm, orte_rml_tag_t tag )
|
||||||
@ -416,9 +418,12 @@ ompi_comm_start_processes(int count, char **array_of_commands,
|
|||||||
apps[i]->env[1] = NULL;
|
apps[i]->env[1] = NULL;
|
||||||
for (j = 0; NULL != environ[j]; ++j) {
|
for (j = 0; NULL != environ[j]; ++j) {
|
||||||
if (0 == strncmp("OMPI_", environ[j], 5)) {
|
if (0 == strncmp("OMPI_", environ[j], 5)) {
|
||||||
opal_argv_append(&apps[i]->num_env,
|
/* for some reason, num_env is a size_t. cope */
|
||||||
|
int tmp_num_env = apps[i]->num_env;
|
||||||
|
opal_argv_append(&tmp_num_env,
|
||||||
&apps[i]->env,
|
&apps[i]->env,
|
||||||
environ[j]);
|
environ[j]);
|
||||||
|
apps[i]->num_env = tmp_num_env;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user