* g_compare_name.c, g_delete_sec_context.c, g_dsp_status.c,

	g_exp_sec_context.c, g_imp_sec_context.c, g_rel_buffer.c,
	g_rel_cred.c, g_rel_name.c, g_rel_oid_set.c, get_mechanism.c,
	get_mtype.c: Include stdlib.h and string.h as needed

	* mglueP.h: Add many invocations of NPROTOTYPE and PROTOTYPE to
		prevent breakage.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7378 dc483132-0cff-0310-8789-dd5450dbe970

13 files changed, 273 insertions, 195 deletions

diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index d082892f9..143342cd4 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jan 24 20:49:13 1996  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+	* g_compare_name.c, g_delete_sec_context.c, g_dsp_status.c,
+	g_exp_sec_context.c, g_imp_sec_context.c, g_rel_buffer.c,
+	g_rel_cred.c, g_rel_name.c, g_rel_oid_set.c, get_mechanism.c,
+	get_mtype.c: Include stdlib.h and string.h as needed
+
+	* mglueP.h: Add many invocations of NPROTOTYPE and PROTOTYPE to
+		prevent breakage.
+
 Tue Jan 23 11:52:24 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* add_mechanism.c, g_inquire_cred.c, g_imp_name.c,
diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index e521004ab..ec575aa7e 100644
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -7,6 +7,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 OM_uint32
 gss_compare_name (minor_status,
diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 6bc3c2be6..5ac2dbf55 100644
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_delete_sec_context (minor_status,
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 29542df2c..e31bb5e44 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_display_status (minor_status,
diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index 1bb7a67a6..b0b66b50a 100644
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -9,6 +9,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_export_sec_context(minor_status,
diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index dde516add..63cd14577 100644
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -9,6 +9,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_import_sec_context(minor_status,
diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index 86a13d506..ef1408386 100644
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_buffer (minor_status,
diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index fc30c2801..6f953da70 100644
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_cred(minor_status,
diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index 9e288112a..06fd0a36a 100644
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -7,6 +7,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 OM_uint32
 gss_release_name (minor_status,
diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index ebb84530e..4bcdd3e08 100644
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32
 gss_release_oid_set (minor_status,
diff --git a/src/lib/gssapi/mechglue/get_mechanism.c b/src/lib/gssapi/mechglue/get_mechanism.c
index b72020da2..ef600fd8d 100644
--- a/src/lib/gssapi/mechglue/get_mechanism.c
+++ b/src/lib/gssapi/mechglue/get_mechanism.c
@@ -10,6 +10,10 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
 
 extern gss_mechanism *mechs_array;
 
diff --git a/src/lib/gssapi/mechglue/get_mtype.c b/src/lib/gssapi/mechglue/get_mtype.c
index 6ac9b5db8..618b344d3 100644
--- a/src/lib/gssapi/mechglue/get_mtype.c
+++ b/src/lib/gssapi/mechglue/get_mtype.c
@@ -7,6 +7,9 @@
  */
 
 #include "mglueP.h"
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 OM_uint32 get_mech_type(OID, token)
 
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index d0abead43..bc5110015 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -69,232 +69,264 @@ typedef struct gss_config {
     gss_OID_desc    mech_type;
     void *	    context;
     OM_uint32       (*gss_acquire_cred)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_name_t,		/* desired_name */
-	 OM_uint32,		/* time_req */
-	 gss_OID_set,		/* desired_mechs */
-	 int,			/* cred_usage */
-	 gss_cred_id_t*,	/* output_cred_handle */
-	 gss_OID_set*,		/* actual_mechs */
-	 OM_uint32*		/* time_rec */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_name_t,		/* desired_name */
+		    OM_uint32,		/* time_req */
+		    gss_OID_set,	/* desired_mechs */
+		    int,		/* cred_usage */
+		    gss_cred_id_t*,	/* output_cred_handle */
+		    gss_OID_set*,	/* actual_mechs */
+		    OM_uint32*		/* time_rec */
+		    ));
     OM_uint32       (*gss_release_cred)
-	(void*,			/* context */		       
-	 OM_uint32*,		/* minor_status */
-	 gss_cred_id_t*		/* cred_handle */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */		       
+		    OM_uint32*,		/* minor_status */
+		    gss_cred_id_t*	/* cred_handle */
+		    ));
     OM_uint32       (*gss_init_sec_context)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_cred_id_t,		/* claimant_cred_handle */
-	 gss_ctx_id_t*,		/* context_handle */
-	 gss_name_t,		/* target_name */
-	 gss_OID,		/* mech_type */
-	 int,			/* req_flags */
-	 OM_uint32,		/* time_req */
-	 gss_channel_bindings_t, /* input_chan_bindings */
-	 gss_buffer_t,		/* input_token */
-	 gss_OID*,		/* actual_mech_type */
-	 gss_buffer_t,		/* output_token */
-	 int*,			/* ret_flags */
-	 OM_uint32*		/* time_rec */
-	 );
+	NPROTOTYPE((
+		    void*,			/* context */
+		    OM_uint32*,			/* minor_status */
+		    gss_cred_id_t,		/* claimant_cred_handle */
+		    gss_ctx_id_t*,		/* context_handle */
+		    gss_name_t,			/* target_name */
+		    gss_OID,			/* mech_type */
+		    int,			/* req_flags */
+		    OM_uint32,			/* time_req */
+		    gss_channel_bindings_t,	/* input_chan_bindings */
+		    gss_buffer_t,		/* input_token */
+		    gss_OID*,			/* actual_mech_type */
+		    gss_buffer_t,		/* output_token */
+		    int*,			/* ret_flags */
+		    OM_uint32*			/* time_rec */
+		    ));
     OM_uint32       (*gss_accept_sec_context)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t*,		/* context_handle */
-	 gss_cred_id_t,		/* verifier_cred_handle */
-	 gss_buffer_t,		/* input_token_buffer */
-	 gss_channel_bindings_t, /* input_chan_bindings */
-	 gss_name_t*,		/* src_name */
-	 gss_OID*,		/* mech_type */
-	 gss_buffer_t,		/* output_token */
-	 int*,			/* ret_flags */
-	 OM_uint32*,		/* time_rec */
-	 gss_cred_id_t*		/* delegated_cred_handle */
-	 );
+	NPROTOTYPE((
+		    void*,			/* context */
+		    OM_uint32*,			/* minor_status */
+		    gss_ctx_id_t*,		/* context_handle */
+		    gss_cred_id_t,		/* verifier_cred_handle */
+		    gss_buffer_t,		/* input_token_buffer */
+		    gss_channel_bindings_t,	/* input_chan_bindings */
+		    gss_name_t*,		/* src_name */
+		    gss_OID*,			/* mech_type */
+		    gss_buffer_t,		/* output_token */
+		    int*,			/* ret_flags */
+		    OM_uint32*,			/* time_rec */
+		    gss_cred_id_t*		/* delegated_cred_handle */
+		    ));
     OM_uint32       (*gss_process_context_token)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 gss_buffer_t		/* token_buffer */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    gss_buffer_t	/* token_buffer */
+		    ));
     OM_uint32       (*gss_delete_sec_context)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t*,		/* context_handle */
-	 gss_buffer_t		/* output_token */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t*,	/* context_handle */
+		    gss_buffer_t	/* output_token */
+		    ));
     OM_uint32       (*gss_context_time)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 OM_uint32*		/* time_rec */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    OM_uint32*		/* time_rec */
+		    ));
     OM_uint32       (*gss_sign)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 int,			/* qop_req */
-	 gss_buffer_t,		/* message_buffer */
-	 gss_buffer_t		/* message_token */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    int,		/* qop_req */
+		    gss_buffer_t,	/* message_buffer */
+		    gss_buffer_t	/* message_token */
+		    ));
     OM_uint32       (*gss_verify)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 gss_buffer_t,		/* message_buffer */
-	 gss_buffer_t,		/* token_buffer */
-	 int*			/* qop_state */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    gss_buffer_t,	/* message_buffer */
+		    gss_buffer_t,	/* token_buffer */
+		    int*		/* qop_state */
+		    ));
     OM_uint32       (*gss_seal)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 int,			/* conf_req_flag */
-	 int,			/* qop_req */
-	 gss_buffer_t,		/* input_message_buffer */
-	 int*,			/* conf_state */
-	 gss_buffer_t		/* output_message_buffer */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    int,		/* conf_req_flag */
+		    int,		/* qop_req */
+		    gss_buffer_t,	/* input_message_buffer */
+		    int*,		/* conf_state */
+		    gss_buffer_t	/* output_message_buffer */
+		    ));
     OM_uint32       (*gss_unseal)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 gss_buffer_t,		/* input_message_buffer */
-	 gss_buffer_t,		/* output_message_buffer */
-	 int*,			/* conf_state */
-	 int*			/* qop_state */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    gss_buffer_t,	/* input_message_buffer */
+		    gss_buffer_t,	/* output_message_buffer */
+		    int*,		/* conf_state */
+		    int*		/* qop_state */
+		    ));
     OM_uint32       (*gss_display_status)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 OM_uint32,		/* status_value */
-	 int,			/* status_type */
-	 gss_OID,		/* mech_type */
-	 int*,			/* message_context */
-	 gss_buffer_t		/* status_string */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    OM_uint32,		/* status_value */
+		    int,		/* status_type */
+		    gss_OID,		/* mech_type */
+		    int*,		/* message_context */
+		    gss_buffer_t	/* status_string */
+		    ));
     OM_uint32       (*gss_indicate_mechs)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_OID_set*		/* mech_set */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_OID_set*	/* mech_set */
+		    ));
     OM_uint32       (*gss_compare_name)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_name_t,		/* name1 */
-	 gss_name_t,		/* name2 */
-	 int*			/* name_equal */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_name_t,		/* name1 */
+		    gss_name_t,		/* name2 */
+		    int*		/* name_equal */
+		    ));
     OM_uint32       (*gss_display_name)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_name_t,		/* input_name */
-	 gss_buffer_t,		/* output_name_buffer */
-	 gss_OID*		/* output_name_type */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_name_t,		/* input_name */
+		    gss_buffer_t,	/* output_name_buffer */
+		    gss_OID*		/* output_name_type */
+		    ));
     OM_uint32       (*gss_import_name)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_buffer_t,		/* input_name_buffer */
-	 gss_OID,		/* input_name_type */
-	 gss_name_t*		/* output_name */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_buffer_t,	/* input_name_buffer */
+		    gss_OID,		/* input_name_type */
+		    gss_name_t*		/* output_name */
+		    ));
     OM_uint32       (*gss_release_name)
-	(void*,			/* context */
-	 OM_uint32*,		/* minor_status */
-	 gss_name_t*		/* input_name */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32*,		/* minor_status */
+		    gss_name_t*		/* input_name */
+		    ));
     OM_uint32       (*gss_inquire_cred)
-	(void*,			/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_cred_id_t,		/* cred_handle */
-	 gss_name_t *,		/* name */
-	 OM_uint32 *,		/* lifetime */
-	 int *,			/* cred_usage */
-	 gss_OID_set *		/* mechanisms */
-	 );
+	NPROTOTYPE((
+		    void*,			/* context */
+		    OM_uint32 *,		/* minor_status */
+		    gss_cred_id_t,		/* cred_handle */
+		    gss_name_t *,		/* name */
+		    OM_uint32 *,		/* lifetime */
+		    int *,			/* cred_usage */
+		    gss_OID_set *		/* mechanisms */
+		    ));
     OM_uint32	    (*gss_add_cred)
-	(void*,			/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_cred_id_t,		/* input_cred_handle */
-	 gss_name_t,		/* desired_name */
-	 gss_OID,		/* desired_mech */
-	 gss_cred_usage_t,	/* cred_usage */
-	 OM_uint32,		/* initiator_time_req */
-	 OM_uint32,		/* acceptor_time_req */
-	 gss_cred_id_t *,	/* output_cred_handle */
-	 gss_OID_set *,		/* actual_mechs */
-	 OM_uint32 *,		/* initiator_time_rec */
-	 OM_uint32 *		/* acceptor_time_rec */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_cred_id_t,	/* input_cred_handle */
+		    gss_name_t,		/* desired_name */
+		    gss_OID,		/* desired_mech */
+		    gss_cred_usage_t,	/* cred_usage */
+		    OM_uint32,		/* initiator_time_req */
+		    OM_uint32,		/* acceptor_time_req */
+		    gss_cred_id_t *,	/* output_cred_handle */
+		    gss_OID_set *,	/* actual_mechs */
+		    OM_uint32 *,	/* initiator_time_rec */
+		    OM_uint32 *		/* acceptor_time_rec */
+		    ));
     OM_uint32	    (*gss_export_sec_context)
-	(void*,			/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_ctx_id_t *,	/* context_handle */
-	 gss_buffer_t		/* interprocess_token */
-	 );
+	NPROTOTYPE((
+		    void*,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_ctx_id_t *,	/* context_handle */
+		    gss_buffer_t	/* interprocess_token */
+		    ));
     OM_uint32	    (*gss_import_sec_context)
-	(void *,		/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_buffer_t,		/* interprocess_token */
-	 gss_ctx_id_t *		/* context_handle */
-	 );
+	NPROTOTYPE((
+		    void *,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_buffer_t,	/* interprocess_token */
+		    gss_ctx_id_t *	/* context_handle */
+		    ));
     OM_uint32 	    (*gss_inquire_cred_by_mech)
-	(void *,		/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_cred_id_t,		/* cred_handle */
-	 gss_OID,		/* mech_type */
-	 gss_name_t *,		/* name */
-	 OM_uint32 *,		/* initiator_lifetime */
-	 OM_uint32 *,		/* acceptor_lifetime */
-	 gss_cred_usage_t *	/* cred_usage */
-	 );
+	NPROTOTYPE((
+		    void *,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_cred_id_t,	/* cred_handle */
+		    gss_OID,		/* mech_type */
+		    gss_name_t *,	/* name */
+		    OM_uint32 *,	/* initiator_lifetime */
+		    OM_uint32 *,	/* acceptor_lifetime */
+		    gss_cred_usage_t *	/* cred_usage */
+		    ));
     OM_uint32	    (*gss_inquire_names_for_mech)
-	(void *,		/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_OID,		/* mechanism */
-	 gss_OID_set *		/* name_types */
-	 );
+	NPROTOTYPE((
+		    void *,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_OID,		/* mechanism */
+		    gss_OID_set *	/* name_types */
+		    ));
     OM_uint32	(*gss_inquire_context)
-	(void *,		/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_ctx_id_t,		/* context_handle */
-	 gss_name_t *,		/* src_name */
-	 gss_name_t *,		/* targ_name */
-	 OM_uint32 *,		/* lifetime_rec */
-	 gss_OID *,		/* mech_type */
-	 OM_uint32 *,		/* ctx_flags */
-	 int *,           	/* locally_initiated */
-	 int *			/* open */
-	);
+	NPROTOTYPE((
+		    void *,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_ctx_id_t,	/* context_handle */
+		    gss_name_t *,	/* src_name */
+		    gss_name_t *,	/* targ_name */
+		    OM_uint32 *,	/* lifetime_rec */
+		    gss_OID *,		/* mech_type */
+		    OM_uint32 *,	/* ctx_flags */
+		    int *,           	/* locally_initiated */
+		    int *		/* open */
+		    ));
     OM_uint32	    (*gss_internal_release_oid)
-	(void *,		/* context */
-	 OM_uint32 *,		/* minor_status */
-	 gss_OID *		/* OID */
-	 );
+	NPROTOTYPE((
+		    void *,		/* context */
+		    OM_uint32 *,	/* minor_status */
+		    gss_OID *		/* OID */
+	 ));
     int		     (*pname_to_uid)
-	(char *,		/* pname */
-	 gss_OID,		/* name type */
-	 gss_OID,		/* mech type */
-	 uid_t *		/* uid */
-	 );
+	NPROTOTYPE((
+		    char *,		/* pname */
+		    gss_OID,		/* name type */
+		    gss_OID,		/* mech type */
+		    uid_t *		/* uid */
+		    ));
 
 } *gss_mechanism;
 
 /********************************************************/
 /* Internal mechglue routines */
 
-gss_mechanism get_mechanism (gss_OID);
-OM_uint32 add_mechanism (gss_mechanism, int);
-OM_uint32 get_mech_type(gss_OID *, gss_buffer_t);
-OM_uint32 import_internal_name (OM_uint32 *, gss_OID, gss_union_name_t,
-				gss_name_t *);
-OM_uint32 display_internal_name (OM_uint32 *, gss_OID, gss_name_t,
-				 gss_buffer_t, gss_OID *);
-OM_uint32 release_internal_name (OM_uint32 *, gss_OID, gss_name_t *);
+gss_mechanism get_mechanism
+PROTOTYPE((gss_OID));
+OM_uint32 add_mechanism
+PROTOTYPE((gss_mechanism, int));
+OM_uint32 get_mech_type
+PROTOTYPE((gss_OID *, gss_buffer_t));
+OM_uint32 import_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_union_name_t,
+	   gss_name_t *));
+OM_uint32 display_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_name_t,
+	   gss_buffer_t, gss_OID *));
+OM_uint32 release_internal_name
+PROTOTYPE((OM_uint32 *, gss_OID, gss_name_t *));
 
 OM_uint32 generic_gss_release_oid
 PROTOTYPE( (OM_uint32 *,	/* minor_status */