Resolve minor conflict in merge.

[mech_eap.git] / mech_eap / util_attr.h

diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h
index 28067a9..d6c0a0f 100644 (file)
--- a/mech_eap/util_attr.h
+++ b/mech_eap/util_attr.h
@@ -349,7 +349,7 @@ gssEapSetNameAttribute(OM_uint32 *minor,
 
 OM_uint32
 gssEapExportAttrContext(OM_uint32 *minor,
-                        gss_name_t name,
+                        gss_const_name_t name,
                         gss_buffer_t buffer);
 
 OM_uint32
@@ -359,7 +359,7 @@ gssEapImportAttrContext(OM_uint32 *minor,
 
 OM_uint32
 gssEapDuplicateAttrContext(OM_uint32 *minor,
-                           gss_name_t in,
+                           gss_const_name_t in,
                            gss_name_t out);
 
 OM_uint32