diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 22:08:59 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 22:08:59 +0000 |
| commit | f6fac2d473fc0c279dea590261f6394cfd9fa088 (patch) | |
| tree | b7c227b9e689b74558efb47d18b774ca1dbeabe9 /net/http | |
| parent | 70d891abe3d7c2316cf3f362b3638709559c209c (diff) | |
| download | chromium_src-f6fac2d473fc0c279dea590261f6394cfd9fa088.zip chromium_src-f6fac2d473fc0c279dea590261f6394cfd9fa088.tar.gz chromium_src-f6fac2d473fc0c279dea590261f6394cfd9fa088.tar.bz2 | |
Fix build with Heimdal.
BUG=none
Review URL: http://codereview.chromium.org/8038051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_auth_gssapi_posix.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc index 431cfc4..aff2ac1 100644 --- a/net/http/http_auth_gssapi_posix.cc +++ b/net/http/http_auth_gssapi_posix.cc @@ -55,6 +55,16 @@ static gss_OID_desc GSS_C_NT_EXPORT_NAME_VAL = { } // namespace +// Heimdal >= 1.4 will define the following as preprocessor macros. +// To avoid conflicting declarations, we have to undefine these. +#undef GSS_C_NT_USER_NAME +#undef GSS_C_NT_MACHINE_UID_NAME +#undef GSS_C_NT_STRING_UID_NAME +#undef GSS_C_NT_HOSTBASED_SERVICE_X +#undef GSS_C_NT_HOSTBASED_SERVICE +#undef GSS_C_NT_ANONYMOUS +#undef GSS_C_NT_EXPORT_NAME + gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_VAL; gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_VAL; gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_VAL; |