forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-power/thermald: fix build failure on newer gcc
Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Rick Farina <[email protected]>
- Loading branch information
1 parent
a406490
commit 0f6dddd
Showing
2 changed files
with
45 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001 | ||
From: Anuj Mittal <[email protected]> | ||
Date: Thu, 1 Aug 2019 08:15:52 +0800 | ||
Subject: [PATCH] Use correct format specifier for size_t | ||
|
||
%zu instead of %lu, otherwise on 32 bit: | ||
|
||
| In file included from ../git/src/thd_common.h:27, | ||
| from ../git/src/thd_zone.h:30, | ||
| from ../git/src/thd_zone.cpp:34: | ||
| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)': | ||
| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=] | ||
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); | ||
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ | ||
| | | | ||
| | std::vector<cthd_trip_point>::size_type {aka unsigned int} | ||
| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info' | ||
| 82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__) | ||
| | ^~~~~~~~~~~ | ||
| ../git/src/thd_zone.cpp:322:38: note: format string is defined here | ||
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); | ||
| | ~~^ | ||
| | | | ||
| | long unsigned int | ||
| | %u | ||
|
||
Signed-off-by: Anuj Mittal <[email protected]> | ||
--- | ||
src/thd_zone.cpp | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp | ||
index dd485d9..eb81d61 100644 | ||
--- a/src/thd_zone.cpp | ||
+++ b/src/thd_zone.cpp | ||
@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) { | ||
void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip) | ||
{ | ||
if (trip_points.size()) { | ||
- thd_log_info("trip_points.size():%lu\n", trip_points.size()); | ||
+ thd_log_info("trip_points.size():%zu\n", trip_points.size()); | ||
for (unsigned int j = trip_points.size() - 1;; --j) { | ||
if (trip_points[j].get_trip_type() == trip.get_trip_type()) { | ||
thd_log_info("updating existing trip temp \n"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters