Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #16097 from neheb/telldus

Browse source 
telldus-core: fix compilation with GCC11
This commit is contained in:
Rosen Penev 2021-07-19 04:00:37 -07:00 committed by GitHub
commit e11af80719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/telldus-core/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=telldus-core PKG_NAME:=telldus-core
PKG_VERSION:=2.1.2 PKG_VERSION:=2.1.2
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.telldus.com/TellStick/Software/telldus-core/ PKG_SOURCE_URL:=http://download.telldus.com/TellStick/Software/telldus-core/

33
utils/telldus-core/patches/970-gcc11.patch Normal file
View file

@ -0,0 +1,33 @@
--- a/service/SettingsConfuse.cpp
+++ b/service/SettingsConfuse.cpp
@@ -42,10 +42,10 @@ Settings::Settings(void) {
*/
Settings::~Settings(void) {
TelldusCore::MutexLocker locker(&mutex);
- if (d->cfg > 0) {
+ if (d->cfg) {
cfg_free(d->cfg);
}
- if (d->var_cfg > 0) {
+ if (d->var_cfg) {
cfg_free(d->var_cfg);
}
delete d;
@@ -56,7 +56,7 @@ Settings::~Settings(void) {
*/
std::wstring Settings::getSetting(const std::wstring &strName) const {
TelldusCore::MutexLocker locker(&mutex);
- if (d->cfg > 0) {
+ if (d->cfg) {
std::string setting(cfg_getstr(d->cfg, TelldusCore::wideToString(strName).c_str()));
return TelldusCore::charToWstring(setting.c_str());
}
@@ -68,7 +68,7 @@ std::wstring Settings::getSetting(const
*/
int Settings::getNumberOfNodes(Node node) const {
TelldusCore::MutexLocker locker(&mutex);
- if (d->cfg > 0) {
+ if (d->cfg) {
if (node == Device) {
return cfg_size(d->cfg, "device");
} else if (node == Controller) {