Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CPU: Fixed include guards #5528

Merged
merged 1 commit into from
Jun 8, 2016

Conversation

zhuoshuguo
Copy link
Contributor

Pull request created as per the issue #2623

@zhuoshuguo
Copy link
Contributor Author

@miri64 Sorry, I messed up with the old PR that was for "fix include guards" due to some mistaken operations, and I closed it...
Anyway, how about this one?

@zhuoshuguo zhuoshuguo changed the title Fixed include guards CPU: Fixed include guards Jun 7, 2016
@@ -662,5 +662,5 @@ typedef struct {
#endif


#endif // __LPC11UXX_H__
#endif // LPC11UXX_H__
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you, while your at it change this to C-style comments (/* LPC11UXX_H__ */)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, no problem. :-)

@miri64 miri64 added the Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation label Jun 7, 2016
@miri64 miri64 self-assigned this Jun 7, 2016
/** @} */

#endif /* KINETIS_CPU_USE_MCG */
#endif /* MCG_CPU_H */
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@miri64 Martine, could you help check here. I though /* KINETIS_CPU_USE_MCG */ and /* MCG_CPU_H */ were misplaced in this file, and I made this revision. But I am not sure about it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct.

@miri64
Copy link
Member

miri64 commented Jun 7, 2016

Please squash.

@zhuoshuguo zhuoshuguo force-pushed the fix_header_include_guard branch from a516247 to f3059f1 Compare June 8, 2016 13:40
@zhuoshuguo
Copy link
Contributor Author

squash done.

@miri64 miri64 added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jun 8, 2016
@@ -151,4 +151,4 @@ extern "C" {
}
#endif

#endif // __LPC2387_H
#endif /* __LPC2387_H */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, this one is still (or again?) prefixed with __. Please fix and squash immediately.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Immediate squashing can be done with git commit --amend <file> ;)

@miri64
Copy link
Member

miri64 commented Jun 8, 2016

Apart from a minor issue: ACK, as soon as addressed and Murdock is green.

Fix cpu/lpc2387/include/lpc2387.h
@zhuoshuguo zhuoshuguo force-pushed the fix_header_include_guard branch from f3059f1 to 1cbe79a Compare June 8, 2016 14:39
@zhuoshuguo
Copy link
Contributor Author

Minor issue fixed.

@miri64 miri64 merged commit 9f6a493 into RIOT-OS:master Jun 8, 2016
@jnohlgard
Copy link
Member

Could you remove the trailing double underscores in the lpc files please? Other than that, (untested) ACK.

@jnohlgard
Copy link
Member

Sorry, I got some old mail notifications about this PR, I see that it's already merged

@miri64
Copy link
Member

miri64 commented Jun 10, 2016

I actually prefer at least one, to differentiate them from normal macros, that's why I ACK'd regardless ;)

@zhuoshuguo zhuoshuguo deleted the fix_header_include_guard branch July 18, 2016 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants