diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2025-03-26 15:31:46 +0100 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2025-03-26 15:31:46 +0100 |
| commit | e92c0632c1473fe57383c58f0dfdde3bae7044f4 (patch) | |
| tree | bcb999bdd5c24d320409bf0d60c4aef1fcaf04ab /src/include/libpq/be-gssapi-common.h | |
| parent | 1eb399366ed658d41b8795a0a25599a8599bbcfb (diff) | |
| download | postgresql-e92c0632c1473fe57383c58f0dfdde3bae7044f4.tar.gz postgresql-e92c0632c1473fe57383c58f0dfdde3bae7044f4.zip | |
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@yesql.se>
Co-authored-by: Imran Zaheer <imran.zhir@gmail.com>
Reported-by: Dave Page <dpage@pgadmin.org>
Reviewed-by: Andres Freund <andres@anarazel.de>
Reviewed-by: vignesh C <vignesh21@gmail.com>
Discussion: https://postgr.es/m/20240708173204.3f3xjilglx5wuzx6@awork3.anarazel.de
Diffstat (limited to 'src/include/libpq/be-gssapi-common.h')
| -rw-r--r-- | src/include/libpq/be-gssapi-common.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/include/libpq/be-gssapi-common.h b/src/include/libpq/be-gssapi-common.h index 72f05748b6d..bfe8d7656ed 100644 --- a/src/include/libpq/be-gssapi-common.h +++ b/src/include/libpq/be-gssapi-common.h @@ -16,13 +16,7 @@ #ifdef ENABLE_GSS -#if defined(HAVE_GSSAPI_H) -#include <gssapi.h> -#include <gssapi_ext.h> -#else -#include <gssapi/gssapi.h> -#include <gssapi/gssapi_ext.h> -#endif +#include "libpq/pg-gssapi.h" extern void pg_GSS_error(const char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat); |