Skip to content

[22809] Avoid redefinition warning for OPENSSL_API_COMPAT#5646

Merged
MiguelCompany merged 1 commit intomasterfrom
hotfix/22809
Feb 12, 2025
Merged

[22809] Avoid redefinition warning for OPENSSL_API_COMPAT#5646
MiguelCompany merged 1 commit intomasterfrom
hotfix/22809

Conversation

@MiguelCompany
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany 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.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany added this to the v3.2.0 milestone Feb 12, 2025
@MiguelCompany MiguelCompany requested review from richiprosima and removed request for richiprosima February 12, 2025 09:54
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 12, 2025
@MiguelCompany
Copy link
Copy Markdown
Member Author

@Mergifyio backport 3.1.x 3.0.x

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Feb 12, 2025

backport 3.1.x 3.0.x

✅ Backports have been created

Details

@MiguelCompany MiguelCompany merged commit e0c453b into master Feb 12, 2025
16 checks passed
@MiguelCompany MiguelCompany deleted the hotfix/22809 branch February 12, 2025 15:22
mergify bot pushed a commit that referenced this pull request Feb 12, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e0c453b)
mergify bot pushed a commit that referenced this pull request Feb 12, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e0c453b)
MiguelCompany added a commit that referenced this pull request Feb 13, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e0c453b)

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
MiguelCompany added a commit that referenced this pull request Feb 13, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e0c453b)

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants