From 39460d004571cb126c7a52a1df1435e618d93db2 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 5 Apr 2012 10:32:19 -0700 Subject: [PATCH] Remove duplicate __gss_krb5_mechanism_oid_desc definition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit __gss_krb5_mechanism_oid_desc is now defined in gssapi/gssapi_oid.h, so remove the definition in gssapi/gssapi_krb5.h in favor of including that header. Signed-off-by: Love Hörnquist Åstrand --- lib/gssapi/gssapi/gssapi_krb5.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/gssapi/gssapi/gssapi_krb5.h b/lib/gssapi/gssapi/gssapi_krb5.h index 2f605f5ee..74d5109aa 100644 --- a/lib/gssapi/gssapi/gssapi_krb5.h +++ b/lib/gssapi/gssapi/gssapi_krb5.h @@ -37,6 +37,7 @@ #define GSSAPI_KRB5_H_ #include +#include GSSAPI_CPP_START @@ -60,9 +61,6 @@ extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_nt_principal_name_oid_desc; #define GSS_KRB5_NT_MACHINE_UID_NAME (&__gss_c_nt_machine_uid_name_oid_desc) #define GSS_KRB5_NT_STRING_UID_NAME (&__gss_c_nt_string_uid_name_oid_desc) -extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_mechanism_oid_desc; -#define GSS_KRB5_MECHANISM (&__gss_krb5_mechanism_oid_desc) - /* for compatibility with MIT api */ #define gss_mech_krb5 GSS_KRB5_MECHANISM -- 2.11.4.GIT