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.

Sign up for GitHub

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

Jump to bottom

FreeBSD: fix world build after 143476ce8 #12880

Merged
merged 1 commit into from
Dec 20, 2021
Merged

FreeBSD: fix world build after 143476ce8 #12880

merged 1 commit into from
Dec 20, 2021

Conversation

mmatuska
Copy link
Contributor

Motivation and Context

This fix has been included in FreeBSD since the merge of 143476c but I forgot to submit it upstream.

Description

Do not redefine the fallthrough macro when building with libcpp.

How Has This Been Tested?

Included in FreeBSD main for over 2 months.

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)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@mmatuska
FreeBSD: fix world build after 143476c
af61d43 
Do not redefine the fallthrough macro when building with libcpp.

Signed-off-by: Martin Matuska <mm@FreeBSD.org>
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Dec 20, 2021
@behlendorf behlendorf requested a review from a user December 20, 2021 18:45
@behlendorf behlendorf merged commit 20f5c5b into openzfs:master Dec 20, 2021
ghost pushed a commit to truenas/zfs that referenced this pull request Jan 19, 2022
@mmatuska
FreeBSD: fix world build after 143476c
daabefa 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes openzfs#12880
ghost pushed a commit to truenas/zfs that referenced this pull request Jan 20, 2022
@mmatuska
FreeBSD: fix world build after 143476c
a445c2d 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes openzfs#12880
ghost pushed a commit to truenas/zfs that referenced this pull request Feb 2, 2022
@mmatuska
FreeBSD: fix world build after 143476c
9ecddc4 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes openzfs#12880
tonyhutter pushed a commit that referenced this pull request Feb 3, 2022
@mmatuska @tonyhutter
FreeBSD: fix world build after 143476c
14bf91a 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes #12880
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@mmatuska @nicman23
FreeBSD: fix world build after 143476c
4888893 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes openzfs#12880
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@mmatuska @nicman23
FreeBSD: fix world build after 143476c
ed2746d 
Do not redefine the fallthrough macro when building with libcpp.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes openzfs#12880
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mmatuska @behlendorf