s4:heimdal: import lorikeet-heimdal-201001120029 (commit a5e675fed7c5db8a7370b77ed0bf...

[sfrench/samba-autobuild/.git] / source4 / heimdal / lib / gssapi / gssapi / gssapi_krb5.h

diff --git a/source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h b/source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
index 0baccf5098f65ad750363e8d0deace89393f070d..1b91bbbb845c337c2b0f1b8d1f37e7fea9af8fd9 100644 (file)
--- a/source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
+++ b/source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
@@ -38,9 +38,7 @@
 
 #include <gssapi.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+GSSAPI_CPP_START
 
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
@@ -108,27 +106,27 @@ gss_krb5_ccache_name(OM_uint32 * /*minor_status*/,
                     const char ** /*out_name */);
 
 OM_uint32 GSSAPI_LIB_FUNCTION gsskrb5_register_acceptor_identity
-        (const char */*identity*/);
+        (const char * /*identity*/);
 
 OM_uint32 GSSAPI_LIB_FUNCTION krb5_gss_register_acceptor_identity
-       (const char */*identity*/);
+       (const char * /*identity*/);
 
 OM_uint32 GSSAPI_LIB_FUNCTION gss_krb5_copy_ccache
-       (OM_uint32 */*minor*/,
+       (OM_uint32 * /*minor*/,
         gss_cred_id_t /*cred*/,
-        struct krb5_ccache_data */*out*/);
+        struct krb5_ccache_data * /*out*/);
 
 OM_uint32 GSSAPI_LIB_FUNCTION
-gss_krb5_import_cred(OM_uint32 */*minor*/,
+gss_krb5_import_cred(OM_uint32 * /*minor*/,
                     struct krb5_ccache_data * /*in*/,
                     struct Principal * /*keytab_principal*/,
                     struct krb5_keytab_data * /*keytab*/,
-                    gss_cred_id_t */*out*/);
+                    gss_cred_id_t * /*out*/);
 
 OM_uint32 GSSAPI_LIB_FUNCTION gss_krb5_get_tkt_flags
-       (OM_uint32 */*minor*/,
+       (OM_uint32 * /*minor*/,
         gss_ctx_id_t /*context_handle*/,
-        OM_uint32 */*tkt_flags*/);
+        OM_uint32 * /*tkt_flags*/);
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gsskrb5_extract_authz_data_from_sec_context
@@ -246,8 +244,6 @@ gss_krb5_set_allowable_enctypes(OM_uint32 *minor_status,
                                OM_uint32 num_enctypes,
                                int32_t *enctypes);
 
-#ifdef __cplusplus
-}
-#endif
+GSSAPI_CPP_END
 
 #endif /* GSSAPI_SPNEGO_H_ */