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

Fix -Werror,-Wmacro-redefined in limits.h #10864

Merged
merged 1 commit into from Sep 1, 2020

Conversation

arichardson
Copy link
Contributor

Motivation and Context

FreeBSD buildworld with CROSS_TOOLCHAIN=llvm10 fails without this change.
Originally submitted downstream as https://reviews.freebsd.org/D26196

Description

Those macros are also defined by the compiler-provided float.h which
will be included later on (at least in the FreeBSD buildworld case) and
triggers these -Werror warnings. Including <float.h> first and only
defining the macros when DBL_DIG/FLT_DIG is missing fixes this problem.

How Has This Been Tested?

FreeBSD make buildworld CROSS_TOOLCHAIN=llvm10 fails without this change, succeeds with it applied.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes.
  • I have run the ZFS Test Suite with this change applied.
  • All commit messages are properly formatted and contain Signed-off-by.

Those macros are also defined by the compiler-provided float.h which
will be included later on (at least in the FreeBSD buildworld case) and
triggers these -Werror warnings. Including <float.h> first and only
defining the macros when DBL_DIG/FLT_DIG is missing fixes this problem.

Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
@ghost ghost added the Status: Code Review Needed Ready for review and testing label Sep 1, 2020
@ghost ghost added this to Backport for OpenZFS 2.0 in OpenZFS 2.0 Sep 1, 2020
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 1, 2020
@behlendorf behlendorf merged commit 417e646 into openzfs:master Sep 1, 2020
OpenZFS 2.0 automation moved this from Backport for OpenZFS 2.0 to Done Sep 1, 2020
@behlendorf behlendorf moved this from Done to Backport for OpenZFS 2.0 in OpenZFS 2.0 Sep 1, 2020
behlendorf pushed a commit that referenced this pull request Sep 3, 2020
Those macros are also defined by the compiler-provided float.h which
will be included later on (at least in the FreeBSD buildworld case) and
triggers these -Werror warnings. Including <float.h> first and only
defining the macros when DBL_DIG/FLT_DIG is missing fixes this problem.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Closes #10864
@behlendorf behlendorf moved this from Backport for OpenZFS 2.0 to Done in OpenZFS 2.0 Sep 4, 2020
jsai20 pushed a commit to jsai20/zfs that referenced this pull request Mar 30, 2021
Those macros are also defined by the compiler-provided float.h which
will be included later on (at least in the FreeBSD buildworld case) and
triggers these -Werror warnings. Including <float.h> first and only
defining the macros when DBL_DIG/FLT_DIG is missing fixes this problem.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Closes openzfs#10864
sempervictus pushed a commit to sempervictus/zfs that referenced this pull request May 31, 2021
Those macros are also defined by the compiler-provided float.h which
will be included later on (at least in the FreeBSD buildworld case) and
triggers these -Werror warnings. Including <float.h> first and only
defining the macros when DBL_DIG/FLT_DIG is missing fixes this problem.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Closes openzfs#10864
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
No open projects
OpenZFS 2.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants