Resolve minor conflict in merge.

[mech_eap.git] / mech_eap / display_name.c

diff --git a/mech_eap/display_name.c b/mech_eap/display_name.c
index 2d87e66..b242fad 100644 (file)
--- a/mech_eap/display_name.c
+++ b/mech_eap/display_name.c
@@ -38,7 +38,11 @@
 
 OM_uint32 GSSAPI_CALLCONV
 gss_display_name(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+                 gss_const_name_t name,
+#else
                  gss_name_t name,
+#endif
                  gss_buffer_t output_name_buffer,
                  gss_OID *output_name_type)
 {