tuhaihe opened a new pull request, #1974:
URL: https://github.com/apache/cloudberry/pull/1974
s3conf.cpp includes the OpenSSL headers through s3common_headers.h before it
includes c.h, so pg_config.h redefines OPENSSL_API_COMPAT with a different
value than the one OpenSSL already settled on. On Rocky 8 (gcc 8, OpenSSL
1.1.1) every build of the module prints:
```
In file included from ../../src/include/c.h:56,
from src/s3conf.cpp:16:
../../src/include/pg_config.h:904: warning: "OPENSSL_API_COMPAT" redefined
#define OPENSSL_API_COMPAT 0x10001000L
In file included from /usr/include/openssl/opensslconf.h:42,
from /usr/include/openssl/hmac.h:13,
from include/s3common_headers.h:8,
from include/gpcommon.h:4,
from include/s3conf.h:4,
from src/s3conf.cpp:1:
/usr/include/openssl/opensslconf-x86_64.h:145: note: this is the location
of the previous definition
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
```
Undefine it before including c.h. By then the OpenSSL headers are fully
parsed, so the macro no longer affects anything and behaviour is unchanged --
only the warning goes away. Reordering the includes so that c.h comes first
would also work, but it would move the extern "C" block ahead of the C++
standard headers pulled in by s3common_headers.h.
gpcloud.cpp is the only other file in the module that includes a PostgreSQL
header, and it includes postgres.h on its first line, ahead of any OpenSSL
header, so it does not have the problem.
Assisted-by: Claude Code
Backpatch-through: REL_2_STABLE
<!-- Thank you for your contribution to Apache Cloudberry (Incubating)! -->
Fixes #ISSUE_Number
### What does this PR do?
<!-- Brief overview of the changes, including any major features or fixes -->
### Type of Change
- [ ] Bug fix (non-breaking change)
- [ ] New feature (non-breaking change)
- [ ] Breaking change (fix or feature with breaking changes)
- [ ] Documentation update
### Breaking Changes
<!-- Remove if not applicable. If yes, explain impact and migration path -->
### Test Plan
<!-- How did you test these changes? -->
- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Passed `make installcheck`
- [ ] Passed `make -C src/test installcheck-cbdb-parallel`
### Impact
<!-- Remove sections that don't apply -->
**Performance:**
<!-- Any performance implications? -->
**User-facing changes:**
<!-- Any changes visible to users? -->
**Dependencies:**
<!-- New dependencies or version changes? -->
### Checklist
- [ ] Followed [contribution
guide](https://cloudberry.apache.org/contribute/code)
- [ ] Added/updated documentation
- [ ] Reviewed code for security implications
- [ ] This PR contains AI-assisted code generation
- [ ] Requested review from [cloudberry
committers](https://github.com/orgs/apache/teams/cloudberry-committers)
### Additional Context
<!-- Any other information that would help reviewers? Remove if none -->
### CI Skip Instructions
<!--
To skip CI builds, add the appropriate CI skip identifier to your PR title.
The identifier must:
- Be in square brackets []
- Include the word "ci" and either "skip" or "no"
- Only use for documentation-only changes or when absolutely necessary
-->
---
<!-- Join our community:
- Mailing list:
[[email protected]](https://lists.apache.org/[email protected])
(subscribe: [email protected])
- Discussions: https://github.com/apache/cloudberry/discussions -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
