From 8c1cca1a87a6219eb139cbeac55dddad5e12659c Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Fri, 18 Nov 2022 14:35:41 +0100 Subject: [PATCH] Correctly fix OpenSSL 3.0 warnings (#6502) In #6038 I tried to fix OpenSSL 3.0 warnings with PG13, but I had made a mistake when doing that. This actually fixes these warnings. (cherry picked from commit a477ffdf4bacb5ece83b8ccda0f71afc84c472a6) --- src/backend/distributed/utils/enable_ssl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/distributed/utils/enable_ssl.c b/src/backend/distributed/utils/enable_ssl.c index 28f8026fa..b449fa3e4 100644 --- a/src/backend/distributed/utils/enable_ssl.c +++ b/src/backend/distributed/utils/enable_ssl.c @@ -9,20 +9,22 @@ */ +#include "postgres.h" + /* * Make sure that functions marked as deprecated in OpenSSL 3.0 don't trigger * deprecation warnings by indicating that we're using the OpenSSL 1.0.1 * compatibile API. Postgres does this by already in PG14, so we should not do - * it otherwise we get warnings about redefining this value. + * it otherwise we get warnings about redefining this value. This needs to be + * done before including libpq.h. */ +#include "distributed/pg_version_constants.h" #if PG_VERSION_NUM < PG_VERSION_14 #ifndef OPENSSL_API_COMPAT #define OPENSSL_API_COMPAT 0x1000100L #endif #endif -#include "postgres.h" - #include "distributed/connection_management.h" #include "distributed/memutils.h" #include "distributed/worker_protocol.h"