From 568620dfd6912351b4127435eca5309f823abde8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 7 Nov 2021 11:33:53 -0500 Subject: [PATCH] contrib/sslinfo needs a fix too to make hamerkop happy. Re-ordering the #include's is a bit problematic here because libpq/libpq-be.h needs to include . Instead, let's #undef the unwanted macro after all the #includes. This is definitely uglier than the other way, but it should work despite possible future header rearrangements. (A look at the openssl headers indicates that X509_NAME is the only conflicting symbol that we use.) In passing, remove a related but long-incorrect comment in pg_backup_archiver.h. Discussion: https://postgr.es/m/1051867.1635720347@sss.pgh.pa.us --- contrib/sslinfo/sslinfo.c | 11 +++++++++++ src/bin/pg_dump/pg_backup_archiver.h | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index 30cae0bb98..5fd46b9874 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -19,6 +19,17 @@ #include "miscadmin.h" #include "utils/builtins.h" +/* + * On Windows, includes a #define for X509_NAME, which breaks our + * ability to use OpenSSL's version of that symbol if is pulled + * in after ... and, at least on some builds, it is. We + * can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h + * #includes . Instead, just zap the #define again here. + */ +#ifdef X509_NAME +#undef X509_NAME +#endif + PG_MODULE_MAGIC; static Datum X509_NAME_field_to_text(X509_NAME *name, text *fieldName); diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 91060944f1..540d4f6a83 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -32,10 +32,6 @@ #define LOBBUFSIZE 16384 -/* - * Note: zlib.h must be included *after* libpq-fe.h, because the latter may - * include ssl.h, which has a naming conflict with zlib.h. - */ #ifdef HAVE_LIBZ #include #define GZCLOSE(fh) gzclose(fh)