From ae5180aa3b5f1aa63215e0eef8944965d5566899 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 17 Dec 2004 03:20:39 +0000 Subject: [PATCH] Ok, it's *not* enough to only have one of the files compilable. Need to make them all compilable. #if 0'ed out one section in soh_base_open.c that needs to be fixed. This commit was SVN r3841. --- src/mca/soh/base/Makefile.am | 4 +--- src/mca/soh/base/soh_base_open.c | 4 ++++ src/mca/soh/base/soh_base_select.c | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mca/soh/base/Makefile.am b/src/mca/soh/base/Makefile.am index 67206b6dca..caf8499125 100644 --- a/src/mca/soh/base/Makefile.am +++ b/src/mca/soh/base/Makefile.am @@ -29,9 +29,7 @@ headers = \ libmca_soh_base_la_SOURCES = \ $(headers) \ - soh_base_close.c - -for_ralph_to_fix = \ + soh_base_close.c \ soh_base_select.c \ soh_base_open.c diff --git a/src/mca/soh/base/soh_base_open.c b/src/mca/soh/base/soh_base_open.c index 02d8bc9367..2a1f56f685 100644 --- a/src/mca/soh/base/soh_base_open.c +++ b/src/mca/soh/base/soh_base_open.c @@ -43,7 +43,11 @@ */ int mca_soh_base_output = -1; mca_soh_base_module_t ompi_soh_monitor = { +#if RALPH_NEEDS_TO_FIX mca_soh_base_update_cell_soh_not_available; +#else + NULL +#endif }; bool mca_soh_base_selected = false; ompi_list_t mca_soh_base_components_available; diff --git a/src/mca/soh/base/soh_base_select.c b/src/mca/soh/base/soh_base_select.c index ea1920f229..f29fb1de21 100644 --- a/src/mca/soh/base/soh_base_select.c +++ b/src/mca/soh/base/soh_base_select.c @@ -15,6 +15,7 @@ #include "ompi_config.h" +#include "include/constants.h" #include "mca/mca.h" #include "mca/base/base.h"