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

[22809] Avoid redefinition warning for OPENSSL_API_COMPAT (backport #5646) #5649

Merged
merged 1 commit into from
Feb 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

Description

The changes here ensure that:

  1. OPENSSL_API_COMPAT is always defined before including any OpenSSL header
  2. It is never redefined, as we #undef it before defining it

@Mergifyio backport 3.1.x 3.0.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • NO: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

    • With our current CI infrastructure I found no way of reproducing the redefinition warning, but I locally checked that an equivalent of this built successfully
  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5646 done by [Mergify](https://mergify.com).

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit e0c453b)
@MiguelCompany MiguelCompany added this to the v3.0.2 milestone Feb 13, 2025
@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Feb 13, 2025
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 13, 2025
Copy link
Contributor

@Javgilavi Javgilavi left a comment

Choose a reason for hiding this comment

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

LGTM

@Javgilavi Javgilavi added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Feb 13, 2025
@MiguelCompany MiguelCompany merged commit 71c2e0f into 3.0.x Feb 13, 2025
14 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.0.x/pr-5646 branch February 13, 2025 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants