Skip to content

cpu: replace header guards with #pragma once#21501

Merged
gschorcht merged 1 commit intoRIOT-OS:masterfrom
N11cc00:fix-cpu-headers
May 21, 2025
Merged

cpu: replace header guards with #pragma once#21501
gschorcht merged 1 commit intoRIOT-OS:masterfrom
N11cc00:fix-cpu-headers

Conversation

@N11cc00
Copy link
Copy Markdown
Contributor

@N11cc00 N11cc00 commented May 21, 2025

Contribution description

This is part of a greater effort to replace all header guards in RIOT with #pragma once. This PR only affects all headers under cpu/, excluding those that have a path that contains /vendor/.

Issues/PRs references

Tracking issue #21335

@github-actions github-actions bot added Platform: native Platform: This PR/issue effects the native platform Platform: MSP Platform: This PR/issue effects MSP-based platforms Platform: ARM Platform: This PR/issue effects ARM-based platforms Platform: AVR Platform: This PR/issue effects AVR-based platforms Platform: ESP Platform: This PR/issue effects ESP-based platforms Platform: RISC-V Platform: This PR/issue effects RISC-V-based platforms Area: cpu Area: CPU/MCU ports labels May 21, 2025
@N11cc00 N11cc00 mentioned this pull request May 20, 2025
Closed
8 tasks
@maribu maribu added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label May 21, 2025
@crasbe crasbe added the Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation label May 21, 2025
@riot-ci
Copy link
Copy Markdown

riot-ci commented May 21, 2025

Murdock results

✔️ PASSED

fe821ea cpu: replace header guards with #pragma once

Success Failures Total Runtime
10363 0 10363 13m:02s

Artifacts

@maribu maribu enabled auto-merge May 21, 2025 15:47
@maribu maribu added this pull request to the merge queue May 21, 2025
@gschorcht
Copy link
Copy Markdown
Contributor

gschorcht commented May 21, 2025 •
edited
Loading

Could we please wait with merging this PR until I have checked if the rebase of PR #21261, which touches almost all headers in cpu/esp32 and cpu/esp_common, ends in a nightmare of conflicts or not, and if it might be better to do the header guard changes for cpu/esp* in a separate PR once PR #21261 is merged.

@mguetschow mguetschow removed this pull request from the merge queue due to a manual request May 21, 2025
@gschorcht gschorcht added this pull request to the merge queue May 21, 2025
@gschorcht
Copy link
Copy Markdown
Contributor

gschorcht commented May 21, 2025

@mguetschow Thanks

Ok, I tried to rebase PR #21261 oto this PR. There were only about 15 merge conflicts, but most of them only for the #pragma once directive in header files, in which I had already replaced the header guards by #pragma once directives during the migration process or for files that no longer exist. So the changes are also OK for cpu/esp*.

Merged via the queue into RIOT-OS:master with commit 9156357 May 21, 2025
28 checks passed
@crasbe
Copy link
Copy Markdown
Contributor

crasbe commented May 21, 2025

@maribu you were a bit too quick. This PR caused a lot of static errors for consecutive empty lines:

image

@maribu
Copy link
Copy Markdown
Member

maribu commented May 21, 2025

Those are easy to fix, though: #21502

@Teufelchen1 Teufelchen1 added this to the Release 2025.07 milestone Jul 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@maribu maribu maribu approved these changes

@aabadie aabadie Awaiting requested review from aabadie aabadie is a code owner

@vincent-d vincent-d Awaiting requested review from vincent-d vincent-d is a code owner

@benpicco benpicco Awaiting requested review from benpicco benpicco is a code owner

@dylad dylad Awaiting requested review from dylad dylad is a code owner

@keestux keestux Awaiting requested review from keestux keestux is a code owner

@kaspar030 kaspar030 Awaiting requested review from kaspar030 kaspar030 is a code owner

@gschorcht gschorcht Awaiting requested review from gschorcht gschorcht is a code owner

@bergzand bergzand Awaiting requested review from bergzand bergzand is a code owner

@basilfx basilfx Awaiting requested review from basilfx basilfx is a code owner

@nandojve nandojve Awaiting requested review from nandojve nandojve is a code owner

@kYc0o kYc0o Awaiting requested review from kYc0o kYc0o is a code owner

Assignees

No one assigned

Labels

Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Platform: AVR Platform: This PR/issue effects AVR-based platforms Platform: ESP Platform: This PR/issue effects ESP-based platforms Platform: MSP Platform: This PR/issue effects MSP-based platforms Platform: native Platform: This PR/issue effects the native platform Platform: RISC-V Platform: This PR/issue effects RISC-V-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Milestone

Release 2025.07

Development

Successfully merging this pull request may close these issues.

6 participants

@N11cc00 @riot-ci @gschorcht @crasbe @maribu @Teufelchen1