include/debug.h: Move to include/nuttx/debug.h#18660
Merged
acassis merged 2 commits intoapache:masterfrom Apr 7, 2026
Merged
Conversation
github-actions
bot
added
Arch: arm
simbit18
requested review from
acassis,
anchao,
jerpelea,
linguini1,
lupyuen,
michallenc and
raiden00pl
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
from
9921de7 to
968b6ed
Compare
Contributor
No, the warnings you pasted in your last comment are from compilation. If I understand correctly, this warning is inside the legacy debug.h header you kept for backwards compatibility? So if it's appearing, it means that header is still getting included somewhere. One inclusion is in nsh_console.c. Maybe you can open a twin PR to nuttx-apps to replace the includes there too |
Contributor
Author
|
@linguini1 I’ve already submitted the PR for nuttx_apps. Regarding the warnings, you’re right. My understanding is that the CI is failing because it checks against the current master of nuttx_apps, which doesn’t yet include the corresponding changes. |
Contributor
My bad, didn't realize! Could you please link to it in the description of this PR?
Hmmm, usually warnings do not cause CI to fail, but I'm on mobile right now so I can't check to give a reason. |
Contributor
Author
|
@linguini1 I have updated the description |
Contributor
Author
|
Hey @linguini1, |
Contributor
|
Hi @PiyushPatle26 see here https://github.com/apache/nuttx/actions/runs/23870320029/job/69600320022?pr=18660
|
Contributor
Author
This failures appear to be pre-existing issues in files not touched by this PR (e.g., |
Contributor
|
You'll need to fix them in this PR, ideally as a separate commit (?) The style checking tools only see what files you edited (which is a lot of them because of the header change), so existing formatting issues are being reported. It's not a result of your changes, but it would be best just to fix them in this PR. Also, if possible, use the "re-request review" button to get my review again instead of the @ mentions (unless it's a reply to something specific); it keeps the notifications in my inbox instead of push notifications :) |
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
from
0cb2a03 to
9391494
Compare
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
from
9391494 to
558048a
Compare
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
2 times, most recently
from
ae4ce89 to
c5acdb8
Compare
Contributor
Author
|
@xiaoxiang781216 i have done the changes, anything else we must change ? Or the PR is ready to be merged |
Contributor
please fix the conflict |
debug.h is a NuttX-specific, non-POSIX header. Placing it in the top-level include/ directory creates naming conflicts with external projects that define their own debug.h. This commit moves the canonical header to include/nuttx/debug.h, following the NuttX convention for non-POSIX/non-standard headers, and updates all in-tree references. A backward-compatibility shim is left at include/debug.h that emits a deprecation #warning and re-includes <nuttx/debug.h>, allowing out-of-tree code to continue building while migrating. Signed-off-by: Piyush Patle <piyushpatle228@gmail.com>
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
from
c5acdb8 to
034fc05
Compare
Contributor
Author
|
@xiaoxiang781216 fixed the conflict |
Fixed copespell errors, for CI sucess! Signed-off-by: Piyush Patle <piyushpatle228@gmail.com>
PiyushPatle26
force-pushed
the
include/refactor-debug-h-location
branch
from
034fc05 to
09b70c2
Compare
xiaoxiang781216
approved these changes
Apr 6, 2026
linguini1
approved these changes
Apr 6, 2026
Contributor
linguini1
left a comment
linguini1
left a comment
There was a problem hiding this comment.
Once this is merged, rebase your NuttX apps PR and hopefully everything there should pass. Then we can merge it too!
Thanks!
Contributor
Author
Will do , Thanks a lot for guidance |
Contributor
Author
|
@acassis can you merge this PR now ? |
Contributor
|
@PiyushPatle26 Given that this PR affects many files prior to the merge, https://github.com/NuttX/manual-nuttx-ci Here’s how to use it data to be entered |
Contributor
|
Thank you very much! @PiyushPatle26 |
Contributor
|
Great tool @simbit18 ! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note: Please adhere to Contributing Guidelines.
Summary
Move the NuttX-specific
debug.hheader from the top-levelinclude/directory to
include/nuttx/debug.h, and update in-tree includes to use the new path.debug.his not a POSIX or standard C header. Keeping it at the top levelcreates avoidable naming conflicts with external projects that also provide a
debug.h. Moving it underinclude/nuttx/aligns it with NuttX conventions for non-standard headers.A backward-compatibility shim is left at
include/debug.hthat emits a deprecation#warningand re-includes
<nuttx/debug.h>, allowing out-of-tree code to continue building while migrating.Impact
include/nuttx/debug.h.<nuttx/debug.h>.<debug.h>.Other PR for nuttx_apps
Testing
Tested on Ubuntu Linux in the local NuttX tree.
Host:
Target:
Test application:
ostestI have also tested with
sim:nshconfiguration:Test logs
No board runtime testing was performed because this change is a mechanical
header relocation and include-path update.
Fixes #8986