gnrc/icmpv6: conditional definition of the MIN macro #14358
Merged
Conversation
This file contains 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
gschorcht
requested review from
cgundogan,
haukepetersen,
miri64 and
PeterKietzmann
as code owners
gschorcht
added
Area: network
miri64
requested changes
Jun 25, 2020
| @@ -27,7 +27,9 @@ | |||
| #define ICMPV6_ERROR_SET_VALUE(data, value) \ | |||
| ((icmpv6_error_pkt_too_big_t *)(data))->mtu = byteorder_htonl(value) | |||
|
|
|||
| #ifndef MIN | |||
There was a problem hiding this comment.
Maybe rather use
Suggested change
| #ifndef MIN | |
| #undef MIN /* undefine common name just to be safe */ |
in case MIN is not actually determining the minimum between two values (could also be just 60 for MINutes?
|
I wonder why RIOT does not have a definition of |
See discussion #13530 (comment) ff |
miri64
approved these changes
Jun 25, 2020
Since `min(a,b)` is a very frequently used function, several libraries such as ESP8266 SDK define a `MIN` macro in their header files. Therefore the `MIN` macro should be undefined before its definition to avoid compilation errors if it is defined anywhere else before.
gschorcht
force-pushed
the
sys/net/gnrc/icmpv6/conditional_min_definition
branch
from
a6e5e1f to
a440ae7
Compare
|
@miri64 Thanks for reviewing and merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Contribution description
While implementing the inlined version of
irq_*functions according to PR #13999 and issue #14356, I ran into a compilation problem with theMINmacro definition insys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c.Since
min(a,b)is a very frequently used function, several libraries such as the ESP8266 SDK define their ownMINmacro in their header files. Therefore theMINmacro ingnrc/icmpv6should only be defined if it has not been defined anywhere else before.Testing procedure
Compilation in Murdock should succeed.
Issues/PRs references