diff options
| author | Magnus Hagander | 2007-07-12 14:43:21 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2007-07-12 14:43:21 +0000 |
| commit | 784fd04940a88e3246001b6024fc4dbf9b9b06e2 (patch) | |
| tree | 6a396d6684eea228c673d017362f9ad15068f15a /src/include | |
| parent | 65a513c2490983e1b95710a805e7cb71956120bc (diff) | |
Enable GSSAPI to build using MSVC. Always build GSSAPI when Kerberos is
enabled, because the only Kerberos library supported always contains it.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/libpq/libpq-be.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 5e15bcdec73..891ab9614c0 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.60 2007/07/12 14:36:52 mha Exp $ + * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.61 2007/07/12 14:43:21 mha Exp $ * *------------------------------------------------------------------------- */ @@ -34,8 +34,16 @@ #include <gssapi.h> #else #include <gssapi/gssapi.h> +#endif /* HAVE_GSSAPI_H */ +/* + * GSSAPI brings in headers that set a lot of things in the global namespace on win32, + * that doesn't match the msvc build. It gives a bunch of compiler warnings that we ignore, + * but also defines a symbol that simply does not exist. Undefine it again. + */ +#ifdef WIN32_ONLY_COMPILER +#undef HAVE_GETADDRINFO #endif -#endif +#endif /* ENABLE_GSS */ #include "libpq/hba.h" #include "libpq/pqcomm.h" |