Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

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

9 files changed, 271 insertions, 271 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 92e17dcee..275a5c6c6 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* gssapi.hin, gssapiP_generic.h: Make prototypes unconditional.
+	* gssapi.hin (PROTOTYPE): Don't define.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	Windows still requires DLL specs for variables.
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 80f7c45ef..9aaf563af 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -46,17 +46,6 @@
 #define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
 
 /*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(__cplusplus) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-/*
  * First, include stddef.h to get size_t defined.
  */
 #if	HAVE_STDDEF_H
@@ -431,7 +420,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_EXPORT_NAME;
 /* Function Prototypes */
 
 OM_uint32 KRB5_CALLCONV gss_acquire_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* desired_name */
             OM_uint32,			/* time_req */
             gss_OID_set,		/* desired_mechs */
@@ -439,15 +428,15 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             gss_cred_id_t *,	/* output_cred_handle */
             gss_OID_set *,		/* actual_mechs */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t *		/* cred_handle */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_init_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t,		/* claimant_cred_handle */
             gss_ctx_id_t *,		/* context_handle */
             gss_name_t,			/* target_name */
@@ -460,10 +449,10 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             gss_buffer_t,		/* output_token */
             OM_uint32 *,		/* ret_flags */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_accept_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t *,		/* context_handle */
             gss_cred_id_t,		/* acceptor_cred_handle */
             gss_buffer_t,		/* input_token_buffer */
@@ -474,127 +463,127 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
             OM_uint32 *,		/* ret_flags */
             OM_uint32 *,		/* time_rec */
             gss_cred_id_t *		/* delegated_cred_handle */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_process_context_token
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             gss_buffer_t		/* token_buffer */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_delete_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t *,		/* context_handle */
             gss_buffer_t		/* output_token */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_context_time
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             OM_uint32 *		/* time_rec */
-           ));
+           );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_get_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t		/* message_token */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_verify_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t,		/* message_token */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_wrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* input_message_buffer */
 	    int *,			/* conf_state */
 	    gss_buffer_t		/* output_message_buffer */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_unwrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(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 */
 	    gss_qop_t *		/* qop_state */
-	   ));
+	   );
 
 OM_uint32 KRB5_CALLCONV gss_display_status
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             OM_uint32,			/* status_value */
             int,			/* status_type */
             gss_OID,			/* mech_type (used to be const) */
             OM_uint32 *,		/* message_context */
             gss_buffer_t		/* status_string */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_indicate_mechs
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_OID_set *		/* mech_set */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_compare_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* name1 */
             gss_name_t,			/* name2 */
             int *			/* name_equal */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_display_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t,			/* input_name */
             gss_buffer_t,		/* output_name_buffer */
             gss_OID *		/* output_name_type */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_import_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_buffer_t,		/* input_name_buffer */
             gss_OID,			/* input_name_type(used to be const) */
             gss_name_t *		/* output_name */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_name
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_name_t *		/* input_name */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_buffer
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_buffer_t		/* buffer */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_release_oid_set
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_OID_set * 		/* set */
-           ));
+           );
 
 OM_uint32 KRB5_CALLCONV gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
             gss_cred_id_t,		/* cred_handle */
             gss_name_t *,		/* name */
             OM_uint32 *,		/* lifetime */
             gss_cred_usage_t *,	/* cred_usage */
             gss_OID_set *		/* mechanisms */
-           ));
+           );
 
 /* Last argument new for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_name_t *,		/* src_name */
 	    gss_name_t *,		/* targ_name */
@@ -603,37 +592,37 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    OM_uint32 *,		/* ctx_flags */
 	    int *,           	/* locally_initiated */
 	    int *			/* open */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    OM_uint32,			/* req_output_size */
 	    OM_uint32 *			/* max_input_size */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_import_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    void *,			/* input_name */
 	    gss_OID,			/* input_name_type */
 	    gss_name_t *		/* output_name */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
 	    void **		/* output_name */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_add_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t,		/* input_cred_handle */
 	    gss_name_t,			/* desired_name */
 	    gss_OID,			/* desired_mech */
@@ -644,80 +633,80 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    gss_OID_set *,		/* actual_mechs */
 	    OM_uint32 *,		/* initiator_time_rec */
 	    OM_uint32 *		/* acceptor_time_rec */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(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 */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t *,		/* context_handle */
 	    gss_buffer_t		/* interprocess_token */
-	    ));
+	    );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_import_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* interprocess_token */
 	    gss_ctx_id_t *		/* context_handle */
-	    ));
+	    );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID_set *		/* oid_set */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_add_oid_set_member
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* member_oid */
 	    gss_OID_set *		/* oid_set */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* member */
 	    gss_OID_set,		/* set */
 	    int *			/* present */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_str_to_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* oid_str */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_oid_to_str
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* oid */
 	    gss_buffer_t		/* oid_str */
-	   ));
+	   );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set *		/* name_types */
-	   ));
+	   );
 
 /*
  * The following routines are obsolete variants of gss_get_mic, gss_wrap,
@@ -727,61 +716,61 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
  * V1 applications to link against GSSAPI V2 implementations.
  */
 OM_uint32 KRB5_CALLCONV gss_sign
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(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 KRB5_CALLCONV gss_verify
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(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 KRB5_CALLCONV gss_seal
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(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 KRB5_CALLCONV gss_unseal
-PROTOTYPE( (OM_uint32 *,    /* minor_status */
+(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 */
-           ));
+           );
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_export_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_buffer_t		/* exported_name */
-	));
+	);
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_duplicate_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_name_t *		/* dest_name */
-	));
+	);
 
 /* New for V2 */
 OM_uint32 KRB5_CALLCONV gss_canonicalize_name
-PROTOTYPE(	(OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 const gss_OID,		/* mech_type */
 		 gss_name_t *		/* output_name */
-	));
+	);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 076509aaf..d6962f1aa 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -99,51 +99,51 @@
 
 typedef struct _g_set *g_set;
 
-int g_set_init PROTOTYPE((g_set *s));
-int g_set_destroy PROTOTYPE((g_set *s));
-int g_set_entry_add PROTOTYPE((g_set *s, void *key, void *value));
-int g_set_entry_delete PROTOTYPE((g_set *s, void *key));
-int g_set_entry_get PROTOTYPE((g_set *s, void *key, void **value));
+int g_set_init (g_set *s);
+int g_set_destroy (g_set *s);
+int g_set_entry_add (g_set *s, void *key, void *value);
+int g_set_entry_delete (g_set *s, void *key);
+int g_set_entry_get (g_set *s, void *key, void **value);
 
-int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_save_name (void **vdb, gss_name_t *name);
+int g_save_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_save_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_validate_name (void **vdb, gss_name_t *name);
+int g_validate_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_validate_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int g_delete_name (void **vdb, gss_name_t *name);
+int g_delete_cred_id (void **vdb, gss_cred_id_t *cred);
+int g_delete_ctx_id (void **vdb, gss_ctx_id_t *ctx);
 
-int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int g_make_string_buffer (const char *str, gss_buffer_t buffer);
 
-int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int g_copy_OID_set (const gss_OID_set_desc * const in, gss_OID_set *out);
 
-int g_token_size PROTOTYPE((gss_OID mech, unsigned int body_size));
+int g_token_size (gss_OID mech, unsigned int body_size);
 
-void g_make_token_header PROTOTYPE((gss_OID mech, int body_size,
-			  unsigned char **buf, int tok_type));
+void g_make_token_header (gss_OID mech, int body_size,
+			  unsigned char **buf, int tok_type);
 
-gss_int32 g_verify_token_header PROTOTYPE((gss_OID mech, int *body_size,
-			  unsigned char **buf, int tok_type, int toksize));
+gss_int32 g_verify_token_header (gss_OID mech, int *body_size,
+			  unsigned char **buf, int tok_type, int toksize);
 
-OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_major_status (OM_uint32 *minor_status,
 				 OM_uint32 status_value,
 				 OM_uint32 *message_context,
-				 gss_buffer_t status_string));
+				 gss_buffer_t status_string);
 
-OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 g_display_com_err_status (OM_uint32 *minor_status,
 				   OM_uint32 status_value,
-				   gss_buffer_t status_string));
+				   gss_buffer_t status_string);
 
-gss_int32 g_order_init PROTOTYPE((void **queue, OM_uint32 seqnum,
-				  int do_replay, int do_sequence));
+gss_int32 g_order_init (void **queue, OM_uint32 seqnum,
+				  int do_replay, int do_sequence);
 
-gss_int32 g_order_check PROTOTYPE((void **queue, OM_uint32 seqnum));
+gss_int32 g_order_check (void **queue, OM_uint32 seqnum);
 
-void g_order_free PROTOTYPE((void **queue));
+void g_order_free (void **queue);
 
 gss_uint32 g_queue_size(void *vqueue, size_t *sizep);
 gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf,
@@ -151,59 +151,59 @@ gss_uint32 g_queue_externalize(void *vqueue, unsigned char **buf,
 gss_uint32 g_queue_internalize(void **vqueue, unsigned char **buf,
 			       size_t *lenremain);
 
-char *g_strdup PROTOTYPE((char *str));
+char *g_strdup (char *str);
 
 /** declarations of internal name mechanism functions **/
 
 OM_uint32 generic_gss_release_buffer
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
-           ));
+           );
 
 OM_uint32 generic_gss_release_oid_set
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
-           ));
+           );
 
 OM_uint32 generic_gss_release_oid
-PROTOTYPE((OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID*         /* set */
-           ));
+           );
 
 OM_uint32 generic_gss_copy_oid
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* oid */
 	    gss_OID *		/* new_oid */
-	    ));
+	    );
 
 OM_uint32 generic_gss_create_empty_oid_set
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID_set *	/* oid_set */
-	   ));
+	   );
 
 OM_uint32 generic_gss_add_oid_set_member
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* member_oid */
 	    gss_OID_set *	/* oid_set */
-	   ));
+	   );
 
 OM_uint32 generic_gss_test_oid_set_member
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* member */
 	    gss_OID_set,	/* set */
 	    int *		/* present */
-	   ));
+	   );
 
 OM_uint32 generic_gss_oid_to_str
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_OID,		/* oid */
 	    gss_buffer_t	/* oid_str */
-	   ));
+	   );
 
 OM_uint32 generic_gss_str_to_oid
-PROTOTYPE( (OM_uint32 *,	/* minor_status */
+(OM_uint32 *,	/* minor_status */
 	    gss_buffer_t,	/* oid_str */
 	    gss_OID *		/* oid */
-	   ));
+	   );
 
 #endif /* _GSSAPIP_GENERIC_H_ */
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 040dce33b..e40b3fc1f 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* gssapiP_krb5.h, gssapi_krb5.h, k5mech.c: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* accept_sec_context.c, gssapiP_krb5.h, import_sec_context.c,
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 16ba01f91..634b9e6b8 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -210,53 +210,53 @@ struct kg2_option {
 /** helper functions **/
 
 OM_uint32 kg_get_defcred 
-	PROTOTYPE((OM_uint32 *minor_status, 
-		   gss_cred_id_t *cred));
+	(OM_uint32 *minor_status, 
+		   gss_cred_id_t *cred);
 
-OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
+OM_uint32 kg_release_defcred (OM_uint32 *minor_status);
 
 krb5_error_code kg_checksum_channel_bindings
-         PROTOTYPE((krb5_context context, gss_channel_bindings_t cb,
+         (krb5_context context, gss_channel_bindings_t cb,
 					     krb5_checksum *cksum,
-					     int bigend));
+					     int bigend);
 
-krb5_error_code kg_make_seq_num PROTOTYPE((krb5_context context,
+krb5_error_code kg_make_seq_num (krb5_context context,
 					   krb5_keyblock *key,
             int direction, krb5_int32 seqnum, unsigned char *cksum,
-				unsigned char *buf));
+				unsigned char *buf);
 
-krb5_error_code kg_get_seq_num PROTOTYPE((krb5_context context,
+krb5_error_code kg_get_seq_num (krb5_context context,
 					  krb5_keyblock *key,
             unsigned char *cksum, unsigned char *buf, int *direction,
-					  krb5_int32 *seqnum));
+					  krb5_int32 *seqnum);
 
-krb5_error_code kg_make_seed PROTOTYPE((krb5_context context,
+krb5_error_code kg_make_seed (krb5_context context,
 					krb5_keyblock *key,
-					unsigned char *seed));
+					unsigned char *seed);
 
-int kg_confounder_size PROTOTYPE((krb5_context context, krb5_keyblock *key));
+int kg_confounder_size (krb5_context context, krb5_keyblock *key);
 
-krb5_error_code kg_make_confounder PROTOTYPE((krb5_context context, 
-	    krb5_keyblock *key, unsigned char *buf));
+krb5_error_code kg_make_confounder (krb5_context context, 
+	    krb5_keyblock *key, unsigned char *buf);
 
-int kg_encrypt_size PROTOTYPE((krb5_context context,
-			       krb5_keyblock *key, int n));
+int kg_encrypt_size (krb5_context context,
+			       krb5_keyblock *key, int n);
 
-krb5_error_code kg_encrypt PROTOTYPE((krb5_context context, 
+krb5_error_code kg_encrypt (krb5_context context, 
 				      krb5_keyblock *key, int usage,
 				      krb5_pointer iv,
 				      krb5_pointer in,
 				      krb5_pointer out,
-				      int length));
+				      int length);
 
-krb5_error_code kg_decrypt PROTOTYPE((krb5_context context,
+krb5_error_code kg_decrypt (krb5_context context,
 				      krb5_keyblock *key,  int usage,
 				      krb5_pointer iv,
 				      krb5_pointer in,
 				      krb5_pointer out,
-				      int length));
+				      int length);
 
-OM_uint32 kg_seal PROTOTYPE((krb5_context context,
+OM_uint32 kg_seal (krb5_context context,
 		  OM_uint32 *minor_status,
 		  gss_ctx_id_t context_handle,
 		  int conf_req_flag,
@@ -264,44 +264,44 @@ OM_uint32 kg_seal PROTOTYPE((krb5_context context,
 		  gss_buffer_t input_message_buffer,
 		  int *conf_state,
 		  gss_buffer_t output_message_buffer,
-		  int toktype));
+		  int toktype);
 
-OM_uint32 kg_unseal PROTOTYPE((krb5_context context,
+OM_uint32 kg_unseal (krb5_context context,
 		    OM_uint32 *minor_status,
 		    gss_ctx_id_t context_handle,
 		    gss_buffer_t input_token_buffer,
 		    gss_buffer_t message_buffer,
 		    int *conf_state,
 		    int *qop_state,
-		    int toktype));
+		    int toktype);
 
-OM_uint32 kg_seal_size PROTOTYPE((krb5_context context,
+OM_uint32 kg_seal_size (krb5_context context,
 				  OM_uint32 *minor_status,
 				  gss_ctx_id_t context_handle,
 				  int conf_req_flag,
 				  gss_qop_t qop_req,
 				  OM_uint32 output_size,
-				  OM_uint32 *input_size));
+				  OM_uint32 *input_size);
 
-krb5_error_code kg_ctx_size PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_size (krb5_context kcontext,
 				       krb5_pointer arg,
-				       size_t *sizep));
+				       size_t *sizep);
 
-krb5_error_code kg_ctx_externalize PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_externalize (krb5_context kcontext,
 					      krb5_pointer arg,
 					      krb5_octet **buffer,
-					      size_t *lenremain));
+					      size_t *lenremain);
 
-krb5_error_code kg_ctx_internalize PROTOTYPE((krb5_context kcontext,
+krb5_error_code kg_ctx_internalize (krb5_context kcontext,
 					      krb5_pointer *argp,
 					      krb5_octet **buffer,
-					      size_t *lenremain));
+					      size_t *lenremain);
 
-OM_uint32 kg_get_context PROTOTYPE((OM_uint32 *minor_status,
-				    krb5_context *context));
+OM_uint32 kg_get_context (OM_uint32 *minor_status,
+				    krb5_context *context);
 	
 OM_uint32
-kg2_parse_token PROTOTYPE((OM_uint32 *minor_status,
+kg2_parse_token (OM_uint32 *minor_status,
 			   unsigned char *ptr,
 			   int length,
 			   krb5_ui_4 *flags,
@@ -310,17 +310,17 @@ kg2_parse_token PROTOTYPE((OM_uint32 *minor_status,
 			   int noptions,
 			   struct kg2_option *options, /* INOUT */
 			   krb5_data *kmsg,
-			   krb5_data *mic));
+			   krb5_data *mic);
 
-void kg2_intersect_ctypes PROTOTYPE((int *nc1, 
+void kg2_intersect_ctypes (int *nc1, 
 				     krb5_cksumtype *c1,
 				     int nc2,
-				     const krb5_cksumtype *c2));
+				     const krb5_cksumtype *c2);
 
 /** declarations of internal name mechanism functions **/
 
 OM_uint32 krb5_gss_acquire_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
             OM_uint32,        /* time_req */
             gss_OID_set,      /* desired_mechs */
@@ -328,15 +328,15 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*,   /* output_cred_handle */
             gss_OID_set*,     /* actual_mechs */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_release_cred
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
-           ));
+           );
 
 OM_uint32 krb5_gss_init_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
             gss_ctx_id_t*,    /* context_handle */
             gss_name_t,       /* target_name */
@@ -350,10 +350,10 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* output_token */
             OM_uint32*,       /* ret_flags */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_accept_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_cred_id_t,    /* verifier_cred_handle */
             gss_buffer_t,     /* input_token_buffer */
@@ -365,112 +365,112 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*,       /* ret_flags */
             OM_uint32*,       /* time_rec */
             gss_cred_id_t*    /* delegated_cred_handle */
-           ));
+           );
 
 OM_uint32 krb5_gss_process_context_token
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
-           ));
+           );
 
 OM_uint32 krb5_gss_delete_sec_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
-           ));
+           );
 
 OM_uint32 krb5_gss_context_time
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
-           ));
+           );
 
 OM_uint32 krb5_gss_sign
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(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 krb5_gss_verify
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(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 krb5_gss_seal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(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 krb5_gss_unseal
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(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 krb5_gss_display_status
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
             int,              /* status_type */
             gss_OID,          /* mech_type */
             OM_uint32*,       /* message_context */
             gss_buffer_t      /* status_string */
-           ));
+           );
 
 OM_uint32 krb5_gss_indicate_mechs
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
-           ));
+           );
 
 OM_uint32 krb5_gss_compare_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
             gss_name_t,       /* name2 */
             int*              /* name_equal */
-           ));
+           );
 
 OM_uint32 krb5_gss_display_name
-PROTOTYPE( (OM_uint32*,      /* minor_status */
+(OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
             gss_buffer_t,    /* output_name_buffer */
             gss_OID*         /* output_name_type */
-           ));
+           );
 
 OM_uint32 krb5_gss_import_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
             gss_OID,          /* input_name_type */
             gss_name_t*       /* output_name */
-           ));
+           );
 
 OM_uint32 krb5_gss_release_name
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
-           ));
+           );
 
 OM_uint32 krb5_gss_inquire_cred
-PROTOTYPE( (OM_uint32 *,      /* minor_status */
+(OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
             gss_name_t *,     /* name */
             OM_uint32 *,      /* lifetime */
             gss_cred_usage_t*,/* cred_usage */
             gss_OID_set *     /* mechanisms */
-           ));
+           );
 
 OM_uint32 krb5_gss_inquire_context
-PROTOTYPE( (OM_uint32*,       /* minor_status */
+(OM_uint32*,       /* minor_status */
 	    gss_ctx_id_t,     /* context_handle */
 	    gss_name_t*,      /* initiator_name */
 	    gss_name_t*,      /* acceptor_name */
@@ -479,69 +479,69 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
 	    OM_uint32*,       /* ret_flags */
 	    int*,             /* locally_initiated */
 	    int*              /* open */
-	   ));
+	   );
 
 /* New V2 entry points */
 OM_uint32 krb5_gss_get_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t		/* message_token */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_verify_mic
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
 	    gss_buffer_t,		/* message_token */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_wrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    gss_buffer_t,		/* input_message_buffer */
 	    int *,			/* conf_state */
 	    gss_buffer_t		/* output_message_buffer */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_unwrap
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(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 */
 	    gss_qop_t *			/* qop_state */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_wrap_size_limit
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
 	    gss_qop_t,			/* qop_req */
 	    OM_uint32,			/* req_output_size */
 	    OM_uint32 *			/* max_input_size */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_import_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    void *,			/* input_name */
 	    gss_OID,			/* input_name_type */
 	    gss_name_t *		/* output_name */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_export_name_object
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
 	    void * *			/* output_name */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_add_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t,		/* input_cred_handle */
 	    gss_name_t,			/* desired_name */
 	    gss_OID,			/* desired_mech */
@@ -552,72 +552,72 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    gss_OID_set *,		/* actual_mechs */
 	    OM_uint32 *,		/* initiator_time_rec */
 	    OM_uint32 *			/* acceptor_time_rec */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_inquire_cred_by_mech
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(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 krb5_gss_export_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_ctx_id_t *,		/* context_handle */
 	    gss_buffer_t		/* interprocess_token */
-	    ));
+	    );
 
 OM_uint32 krb5_gss_import_sec_context
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_buffer_t,		/* interprocess_token */
 	    gss_ctx_id_t *		/* context_handle */
-	    ));
+	    );
 
 OM_uint32 krb5_gss_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *			/* oid */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_internal_release_oid
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID *			/* oid */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_inquire_names_for_mech
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set *		/* name_types */
-	   ));
+	   );
 
 OM_uint32 krb5_gss_canonicalize_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    const gss_OID,		/* mech_type */
 	    gss_name_t *		/* output_name */
-	 ));
+	 );
 	
 OM_uint32 krb5_gss_export_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    gss_buffer_t		/* exported_name */
-	 ));
+	 );
 
 OM_uint32 krb5_gss_duplicate_name
-PROTOTYPE( (OM_uint32  *,		/* minor_status */
+(OM_uint32  *,		/* minor_status */
 	    const gss_name_t,		/* input_name */
 	    gss_name_t *		/* dest_name */
-	 ));
+	 );
 
 OM_uint32 krb5_gss_validate_cred
-PROTOTYPE( (OM_uint32 *,		/* minor_status */
+(OM_uint32 *,		/* minor_status */
 	    gss_cred_id_t		/* cred */
-         ));
+         );
 
 gss_OID krb5_gss_convert_static_mech_oid
-PROTOTYPE( (gss_OID oid
-	 ));
+(gss_OID oid
+	 );
 	
 #endif /* _GSSAPIP_KRB5_H_ */
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 755715028..ea599464b 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -52,18 +52,18 @@ extern const gss_OID_desc krb5_gss_oid_array[];
 #define gss_krb5_nt_string_uid_name	gss_nt_string_uid_name
 
 OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags 
-	PROTOTYPE((OM_uint32 *minor_status,
+	(OM_uint32 *minor_status,
 		   gss_ctx_id_t context_handle,
-		   krb5_flags *ticket_flags));
+		   krb5_flags *ticket_flags);
 
 OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
-	PROTOTYPE((OM_uint32 *minor_status,
+	(OM_uint32 *minor_status,
 		   gss_cred_id_t cred_handle,
-		   krb5_ccache out_ccache));
+		   krb5_ccache out_ccache);
 
 OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
-	PROTOTYPE((OM_uint32 *minor_status, const char *name,
-		   const char **out_name));
+	(OM_uint32 *minor_status, const char *name,
+		   const char **out_name);
 
 #ifdef __cplusplus
 }
diff --git a/src/lib/gssapi/krb5/k5mech.c b/src/lib/gssapi/krb5/k5mech.c
index 11a8ea492..5385cba4f 100644
--- a/src/lib/gssapi/krb5/k5mech.c
+++ b/src/lib/gssapi/krb5/k5mech.c
@@ -23,22 +23,22 @@
 /* ident  "@(#)krb5_gssd_extern_srvr.conf 1.10     95/08/01 SMI" */
 
 OM_uint32 krb5_gss_internal_release_oid
-      PROTOTYPE((void *,                /* context */
+      (void *,                /* context */
        OM_uint32 *,           /* minor_status */
        gss_OID *              /* OID */
-      ));
+      );
 
 extern OM_uint32 krb5_gss_get_context
-	   PROTOTYPE((void**
-	   ));
+	   (void**
+	   );
 
 extern int krb5_pname_to_uid
-             PROTOTYPE((void *,           /* context */
+             (void *,           /* context */
               char *,		/* principal name */
               gss_OID,		/* name_type */
 	      gss_OID,		/* mech_type */
               uid_t *		/* uid (OUT) */
-             ));
+             );
 
 /*
  * This is the declaration of the mechs_array table for Kerberos V5.
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 2d1da9394..9d94d8f0c 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,5 +1,6 @@
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
+	* mechglue.h: Make prototypes unconditional.
 	* mglueP.h: Make all prototypes unconditional.
 	(NPROTOTYPE): Macro deleted.
 
diff --git a/src/lib/gssapi/mechglue/mechglue.h b/src/lib/gssapi/mechglue/mechglue.h
index 43347a49b..af57d25b7 100644
--- a/src/lib/gssapi/mechglue/mechglue.h
+++ b/src/lib/gssapi/mechglue/mechglue.h
@@ -39,7 +39,7 @@
 /* GSSAPI Extension functions -- these functions aren't */
 /* in the GSSAPI, but they are provided in this library */
 
-int gssd_pname_to_uid PROTOTYPE((char *, gss_OID, gss_OID, uid_t *));
-void gss_initialize PROTOTYPE((void));
+int gssd_pname_to_uid (char *, gss_OID, gss_OID, uid_t *);
+void gss_initialize (void);
 
 #endif /* _GSS_MECHGLUE_H */