mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLCD: fix possible compile error

Browse Source 
error: declaration of 'power' shadows a global declaration [-Werror=shadow]


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7490497b4e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-29 (Sun, 29 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-10-29 21:16:01 +01:00
parent 6c726bc223
commit 461b16b1be
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/lcdd.h
View File

@@ -219,7 +219,7 @@ class CLCD
int brightness; int brightness;
unsigned int timeout_cnt; unsigned int timeout_cnt;
unsigned int switch_name_time_cnt; unsigned int switch_name_time_cnt;
void setlcdparameter(int dimm, int power); void setlcdparameter(int dimm, int _power);
void count_down(); void count_down();
#endif #endif

4
src/driver/simple_display.cpp
View File

@@ -692,14 +692,14 @@ void CLCD::count_down() {
} }
} }
void CLCD::setlcdparameter(int dimm, const int power) void CLCD::setlcdparameter(int dimm, const int _power)
{ {
if(dimm < 0) if(dimm < 0)
dimm = 0; dimm = 0;
else if(dimm > 15) else if(dimm > 15)
dimm = 15; dimm = 15;
if(!power) if(!_power)
dimm = 0; dimm = 0;
if(brightness == dimm) if(brightness == dimm)