Skip to content

Commit

Permalink
Use of pmix_getline from PMIx started in v4.2.5
Browse files Browse the repository at this point in the history
Correct the protection to use static versions of
pmix_getline if PMIx version is less than v4.2.5

Signed-off-by: Ralph Castain <rhc@pmix.org>
(cherry picked from commit 5cde35d)
  • Loading branch information
rhc54 committed Apr 3, 2024
1 parent be6155e commit 960ddde
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/mca/ess/base/ess_base_bootstrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static pmix_status_t regex_parse_value_range(char *base, char *range,
char ***names);
static pmix_status_t read_file(char *regexp, char ***names);

#if PMIX_NUMERIC_VERSION < 0x00040208
#if PMIX_NUMERIC_VERSION < 0x00040205
static char *pmix_getline(FILE *fp)
{
char *ret, *buff;
Expand Down
2 changes: 1 addition & 1 deletion src/mca/ras/base/ras_base_allocate.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

#include "src/mca/ras/base/ras_private.h"

#if PMIX_NUMERIC_VERSION < 0x00040208
#if PMIX_NUMERIC_VERSION < 0x00040205
static char *pmix_getline(FILE *fp)
{
char *ret, *buff;
Expand Down
2 changes: 1 addition & 1 deletion src/mca/rmaps/rank_file/rmaps_rank_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int prte_rmaps_rf_process_lsf_affinity_hostfile(prte_job_t *jdata, prte_r

char *prte_rmaps_rank_file_slot_list = NULL;

#if PMIX_NUMERIC_VERSION < 0x00040208
#if PMIX_NUMERIC_VERSION < 0x00040205
static char *pmix_getline(FILE *fp)
{
char *ret, *buff;
Expand Down
4 changes: 2 additions & 2 deletions src/mca/rmaps/seq/rmaps_seq.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Copyright (c) 2015-2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2016 IBM Corporation. All rights reserved.
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -109,7 +109,7 @@ static bool quickmatch(prte_node_t *nd, char *name)
return false;
}

#if PMIX_NUMERIC_VERSION < 0x00040208
#if PMIX_NUMERIC_VERSION < 0x00040205
static char *pmix_getline(FILE *fp)
{
char *ret, *buff;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/prte/prte.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static void shutdown_callback(int fd, short flags, void *arg)
exit(PRTE_ERROR_DEFAULT_EXIT_CODE);
}

#if PMIX_NUMERIC_VERSION < 0x00040208
#if PMIX_NUMERIC_VERSION < 0x00040205
static char *pmix_getline(FILE *fp)
{
char *ret, *buff;
Expand Down

0 comments on commit 960ddde

Please sign in to comment.