pgsql: Move GSSAPI includes into its own header

From: Daniel Gustafsson <dgustafsson(at)postgresql(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Move GSSAPI includes into its own header
Date: 2025-03-26 14:37:03
Message-ID: E1txRsN-0016Of-0Q@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Move GSSAPI includes into its own header

Due to a conflict in macro names on Windows between <wincrypt.h>
and <openssl/ssl.h> these headers need to be included using a
predictable pattern with an undef to handle that. The GSSAPI
header <gssapi.h> does include <wincrypt.h> which cause problems
with compiling PostgreSQL using MSVC when OpenSSL and GSSAPI are
both enabled in the tree. Rather than fixing piecemeal for each
file including gssapi headers, move the the includes and undef
to a new file which should be used to centralize the logic.

This patch is a reworked version of a patch by Imran Zaheer
proposed earlier in the thread. Once this has proven effective
in master we should look at backporting this as the problem
exist at least since v16.

Author: Daniel Gustafsson <daniel(at)yesql(dot)se>
Co-authored-by: Imran Zaheer <imran(dot)zhir(at)gmail(dot)com>
Reported-by: Dave Page <dpage(at)pgadmin(dot)org>
Reviewed-by: Andres Freund <andres(at)anarazel(dot)de>
Reviewed-by: vignesh C <vignesh21(at)gmail(dot)com>
Discussion: https://postgr.es/m/20240708173204.3f3xjilglx5wuzx6@awork3.anarazel.de

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/e92c0632c1473fe57383c58f0dfdde3bae7044f4

Modified Files
--------------
contrib/sslinfo/sslinfo.c | 11 ----------
src/include/libpq/be-gssapi-common.h | 8 +------
src/include/libpq/libpq-be.h | 8 +------
src/include/libpq/pg-gssapi.h | 42 ++++++++++++++++++++++++++++++++++++
src/interfaces/libpq/libpq-int.h | 10 +--------
5 files changed, 45 insertions(+), 34 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Tom Lane 2025-03-26 15:11:32 pgsql: Use PG_MODULE_MAGIC_EXT in our installable shared libraries.
Previous Message Daniel Gustafsson 2025-03-26 12:23:36 pgsql: psql: Make test robust against locale variations