diff options
| author | Andreas Haufler <andreas@haufler.info> | 2026-07-21 10:32:13 +0200 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@kernel.org> | 2026-08-07 17:18:51 +0200 |
| commit | cb0ec27efac2aaf92393ad563a35fb6f00d0a6cd (patch) | |
| tree | c0f4b312e3b537be31685000c6f8479076d92004 | |
| parent | fcbf9964b67a6d6704c50ed28daa24c3b164f01c (diff) | |
| download | linux-stable-cb0ec27efac2aaf92393ad563a35fb6f00d0a6cd.tar.gz linux-stable-cb0ec27efac2aaf92393ad563a35fb6f00d0a6cd.zip | |
tools/lib/thermal: Fix misplaced extern "C" closing brace
The public libthermal header opens the C++ 'extern "C" {' block inside
the __LIBTHERMAL_H include guard, but places the closing brace after
the guard has already ended:
#endif /* __LIBTHERMAL_H */
#ifdef __cplusplus
}
#endif
On a single inclusion the braces still balance, so the problem is
invisible. On the second inclusion of the header in the same C++
translation unit the include guard skips the opening 'extern "C" {',
while the closing '}' lives outside the guard and is emitted anyway.
This leaves a stray '}' and breaks compilation for any C++ consumer
that includes the header more than once.
Move the closing block inside the include guard so both halves of the
'extern "C"' declaration are guarded consistently.
Signed-off-by: Andreas Haufler <andreas@haufler.info>
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
Link: https://patch.msgid.link/20260721083230.91246-1-andreas@haufler.info
| -rw-r--r-- | tools/lib/thermal/include/thermal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/thermal/include/thermal.h b/tools/lib/thermal/include/thermal.h index 818ecdfb46e5..d9097271d9fa 100644 --- a/tools/lib/thermal/include/thermal.h +++ b/tools/lib/thermal/include/thermal.h @@ -175,8 +175,8 @@ LIBTHERMAL_API thermal_error_t thermal_sampling_handle(struct thermal_handler *t LIBTHERMAL_API int thermal_sampling_fd(struct thermal_handler *th); -#endif /* __LIBTHERMAL_H */ - #ifdef __cplusplus } #endif + +#endif /* __LIBTHERMAL_H */ |