Skip to content

romio/daos: better conditionals to build with libdaos.so.0/1 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kccain wants to merge 1 commit into
base: daos_adio-rpm
Choose a base branch
from
+2 −2
Open

romio/daos: better conditionals to build with libdaos.so.0/1 #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mpi/romio/adio/ad_daos/ad_daos_hhash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ int adio_daos_poh_lookup_connect(uuid_t uuid, struct adio_daos_hdl **hdl)

char *group = NULL;
daos_pool_info_t pool_info;
#if DAOS_API_VERSION_MAJOR < 1
#if !defined(DAOS_API_VERSION_MAJOR) || (defined(DAOS_API_VERSION_MAJOR) && (DAOS_API_VERSION_MAJOR < 1))
/** Get the SVCL and Server group from env variables. This is temp as those
* won't be needed later */
char *svcl_str = NULL;
Expand All @@ -166,7 +166,7 @@ int adio_daos_poh_lookup_connect(uuid_t uuid, struct adio_daos_hdl **hdl)
#endif
group = getenv("DAOS_GROUP");

#if DAOS_API_VERSION_MAJOR < 1
#if !defined(DAOS_API_VERSION_MAJOR) || (defined(DAOS_API_VERSION_MAJOR) && (DAOS_API_VERSION_MAJOR < 1))
rc = daos_pool_connect(uuid, group, svcl, DAOS_PC_RW, &phdl->open_hdl, &pool_info, NULL);
d_rank_list_free(svcl);
#else
Expand Down