fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HWLOC_VERSION not always defined.

Browse source
This commit is contained in:
XMRig 2019-07-23 08:06:04 +07:00
parent 4263c6c381
commit 91f732794b
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/base/kernel/Entry.cpp
View file

@ -78,7 +78,15 @@ static int showVersion()
} }
# endif # endif
# if defined(XMRIG_FEATURE_HWLOC)
# if defined(HWLOC_VERSION)
printf("hwloc/%s\n", HWLOC_VERSION); printf("hwloc/%s\n", HWLOC_VERSION);
# elif HWLOC_API_VERSION >= 0x20000
printf("hwloc/2\n");
# else
printf("hwloc/1\n");
# endif
# endif
return 0; return 0;
} }

10
src/base/kernel/config/BaseConfig.cpp
View file

@ -110,8 +110,16 @@ void xmrig::BaseConfig::printVersions()
} }
# endif # endif
# ifdef XMRIG_FEATURE_HWLOC
# if defined(XMRIG_FEATURE_HWLOC)
# if defined(HWLOC_VERSION)
snprintf(buf, sizeof buf, "hwloc/%s ", HWLOC_VERSION); snprintf(buf, sizeof buf, "hwloc/%s ", HWLOC_VERSION);
# elif HWLOC_API_VERSION >= 0x20000
snprintf(buf, sizeof buf, "hwloc/2 ");
# else
snprintf(buf, sizeof buf, "hwloc/1 ");
# endif
libs += buf; libs += buf;
# endif # endif