2023-09-14 04:07:03

by Ian Rogers

Subject: [PATCH v1] perf trace: Avoid compile error wrt redefining bool

Make part of an existing TODO conditional to avoid the following build
error:
```
tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c:26:14: error: cannot combine with previous 'char' declaration specifier
26 | typedef char bool;
| ^
include/stdbool.h:20:14: note: expanded from macro 'bool'
20 | #define bool _Bool
| ^
tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c:26:1: error: typedef requires a name [-Werror,-Wmissing-declarations]
26 | typedef char bool;
| ^~~~~~~~~~~~~~~~~
2 errors generated.
```

Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c
index 90ce22f9c1a9..939ec769bf4a 100644
--- a/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c
+++ b/tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c
@@ -23,7 +23,9 @@
#define MAX_CPUS 4096

// FIXME: These should come from system headers
+#ifndef bool
typedef char bool;
+#endif
typedef int pid_t;
typedef long long int __s64;
typedef __s64 time64_t;
--
2.42.0.283.g2d96d420d3-goog

2023-09-17 05:28:40

by Namhyung Kim

Subject: Re: [PATCH v1] perf trace: Avoid compile error wrt redefining bool

On Wed, Sep 13, 2023 at 11:50 AM Ian Rogers <[email protected]> wrote:
>
> Make part of an existing TODO conditional to avoid the following build
> error:
> ```
> tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c:26:14: error: cannot combine with previous 'char' declaration specifier
> 26 | typedef char bool;
> | ^
> include/stdbool.h:20:14: note: expanded from macro 'bool'
> 20 | #define bool _Bool
> | ^
> tools/perf/util/bpf_skel/augmented_raw_syscalls.bpf.c:26:1: error: typedef requires a name [-Werror,-Wmissing-declarations]
> 26 | typedef char bool;
> | ^~~~~~~~~~~~~~~~~
> 2 errors generated.
> ```
>
> Signed-off-by: Ian Rogers <[email protected]>

Applied to perf-tools, thanks!

Namhyung