From ebad55b93357a5728709b66c3f30e64d0bb3dbb4 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 15 Feb 2013 22:14:23 +0000 Subject: [PATCH] Apply patches from ORNL to fix compile issues - minor stuff. Thanks to Geoffroy Vallee for the patches. This commit was SVN r28065. --- ompi/mca/btl/tcp/btl_tcp_endpoint.c | 4 ++-- ompi/patterns/net/netpatterns_base.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ompi/mca/btl/tcp/btl_tcp_endpoint.c b/ompi/mca/btl/tcp/btl_tcp_endpoint.c index 3aa187396e..7f705fb895 100644 --- a/ompi/mca/btl/tcp/btl_tcp_endpoint.c +++ b/ompi/mca/btl/tcp/btl_tcp_endpoint.c @@ -509,8 +509,8 @@ static int mca_btl_tcp_endpoint_recv_connect_ack(mca_btl_base_endpoint_t* btl_en return OMPI_ERROR; } opal_show_help("help-mpi-btl-tcp.txt", "client handshake fail", - true, orte_process_info.nodename, - orte_process_info.pid, + true, ompi_process_info.nodename, + ompi_process_info.pid, "did not receive entire connect ACK from peer"); return OMPI_ERR_UNREACH; } diff --git a/ompi/patterns/net/netpatterns_base.c b/ompi/patterns/net/netpatterns_base.c index 14e4d54252..c7b7fd930c 100644 --- a/ompi/patterns/net/netpatterns_base.c +++ b/ompi/patterns/net/netpatterns_base.c @@ -8,6 +8,8 @@ * * $HEADER$ */ +#include + #include "opal/mca/base/mca_base_param.h" #include "ompi/include/ompi/constants.h" #include "netpatterns.h"