diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index 3998c2813..d5adce4c9 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -70,7 +70,7 @@ static const char *kCuda = "cuda"; #endif -#if defined(XMRIG_FEATURE_NVML) +#if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) static const char *kHealthPrintTime = "health-print-time"; #endif @@ -92,7 +92,7 @@ public: CudaConfig cuda; # endif -# if defined(XMRIG_FEATURE_NVML) +# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) uint32_t healthPrintTime = 60; # endif }; @@ -142,7 +142,7 @@ const xmrig::RxConfig &xmrig::Config::rx() const #endif -#if defined(XMRIG_FEATURE_NVML) +#if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) uint32_t xmrig::Config::healthPrintTime() const { return d_ptr->healthPrintTime; @@ -194,7 +194,7 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) d_ptr->cuda.read(reader.getValue(kCuda)); # endif -# ifdef XMRIG_FEATURE_NVML +# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) d_ptr->healthPrintTime = reader.getUint(kHealthPrintTime, d_ptr->healthPrintTime); # endif @@ -239,7 +239,7 @@ void xmrig::Config::getJSON(rapidjson::Document &doc) const doc.AddMember(StringRef(kLogFile), m_logFile.toJSON(), allocator); doc.AddMember(StringRef(Pools::kPools), m_pools.toJSON(doc), allocator); doc.AddMember(StringRef(kPrintTime), printTime(), allocator); -# if defined(XMRIG_FEATURE_NVML) +# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) doc.AddMember(StringRef(kHealthPrintTime), healthPrintTime(), allocator); # endif doc.AddMember(StringRef(Pools::kRetries), m_pools.retries(), allocator); diff --git a/src/core/config/Config.h b/src/core/config/Config.h index 5eb91ecae..997fa505c 100644 --- a/src/core/config/Config.h +++ b/src/core/config/Config.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,8 +67,10 @@ public: const RxConfig &rx() const; # endif -# if defined(XMRIG_FEATURE_NVML) +# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) uint32_t healthPrintTime() const; +# else + uint32_t healthPrintTime() const { return 0; } # endif bool isShouldSave() const;