search

mate-desktop / mate-applets

Applets for use with the MATE panel
http://www.mate-desktop.org
GNU General Public License v2.0
79 stars 67 forks source link

cpufreq: fix cpufreq-selector-sysfs duplicate definitions #601

Closed hvdijk closed 3 years ago

hvdijk commented 3 years ago

Commit 4cb6f915 added cpufreq-selector-sysfs.[ch] to mate_cpufreq_selector_SOURCES for the !HAVE_LIBCPUFREQ case, but they were already unconditionally part of that. Including them twice leads to duplicate definitions for the symbols defined by them.

hvdijk commented 3 years ago

cpufreq-selector-sysfs.[c|h] files are only used in cpufreq-monitor-factory.c file:

Good spot. I was focusing on the fact that it was unconditionally used and linked in prior to 4cb6f915 and did not see that 4cb6f915 made it conditional. Would you prefer me to update this PR or you to just commit your fix?

rbuj commented 3 years ago

it’s best that you update your PR

hvdijk commented 3 years ago

Alright, updated. Had already checked to make sure that this builds too, but should point out that that was with the ! HAVE_LIBCPUFREQ case.