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

14 files changed, 227 insertions, 236 deletions

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 39e2f6c..cbc4093 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dump.c: Make prototypes unconditional.
+
 2001-06-26  Ezra Peisach  <epeisach@mit.edu>
 
 	* getdate.y: Provide full prototype for getdate_yylex() and
diff --git a/src/kadmin/cli/dump.c b/src/kadmin/cli/dump.c
index 162e35d..1896e21 100644
--- a/src/kadmin/cli/dump.c
+++ b/src/kadmin/cli/dump.c
@@ -433,10 +433,10 @@ void dump_db(argc, argv)
     char		*programname;
     char		*ofile;
     krb5_error_code	kret;
-    krb5_error_code	(*dump_iterator) PROTOTYPE((krb5_pointer,
-						    char *,
-						    kadm5_principal_ent_rec *));
-    krb5_error_code	(*dump_header) PROTOTYPE((struct dump_args *));
+    krb5_error_code	(*dump_iterator) (krb5_pointer,
+					  char *,
+					  kadm5_principal_ent_rec *);
+    krb5_error_code	(*dump_header) (struct dump_args *);
     const char		* dump_name;
     int			aindex, num, i;
     krb5_boolean	locked;
@@ -1329,11 +1329,11 @@ load_db(argc, argv)
     const char		*dumpfile;
     char		*dbname;
     char		*dbname_tmp;
-    int			(*restore_function) PROTOTYPE((const char *,
+    int			(*restore_function) (const char *,
 						       krb5_context,
 						       const char *,
 						       FILE *,
-						       int));
+						       int);
     const char		* restore_name;
     int			update, verbose;
     krb5_int32		crflags;
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index c753a2c..e8d5c24 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dump.c, kdb5_create.c, kdb5_util.h, loadv4.c, tcl_wrapper.c:
+	Make prototypes unconditional.
+
 2001-07-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* string_table.c (str_INITING_KCONTEXT): Variable deleted.
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index fbc8837..0a6f57f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -66,37 +66,37 @@ struct dump_args {
     int			verbose;
 };
 
-static krb5_error_code dump_k5beta_iterator PROTOTYPE((krb5_pointer,
-						       krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator PROTOTYPE((krb5_pointer,
-							krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator_ext PROTOTYPE((krb5_pointer,
-							    krb5_db_entry *,
-							    int));
-static krb5_error_code dump_k5beta7_princ PROTOTYPE((krb5_pointer,
-						     krb5_db_entry *));
-static krb5_error_code dump_k5beta7_princ_ext PROTOTYPE((krb5_pointer,
-							 krb5_db_entry *,
-							 int));
+static krb5_error_code dump_k5beta_iterator (krb5_pointer,
+					     krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator (krb5_pointer,
+					      krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator_ext (krb5_pointer,
+						  krb5_db_entry *,
+						  int);
+static krb5_error_code dump_k5beta7_princ (krb5_pointer,
+					   krb5_db_entry *);
+static krb5_error_code dump_k5beta7_princ_ext (krb5_pointer,
+					       krb5_db_entry *,
+					       int);
 static krb5_error_code dump_k5beta7_princ_withpolicy
-			PROTOTYPE((krb5_pointer, krb5_db_entry *));
-static krb5_error_code dump_ov_princ PROTOTYPE((krb5_pointer,
-						krb5_db_entry *));
-static void dump_k5beta7_policy PROTOTYPE((void *, osa_policy_ent_t));
-
-typedef krb5_error_code (*dump_func)PROTOTYPE((krb5_pointer,
-					       krb5_db_entry *));
-
-static int process_k5beta_record PROTOTYPE((char *, krb5_context,
-					    FILE *, int, int *, void *));
-static int process_k5beta6_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_k5beta7_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_ov_record PROTOTYPE((char *, krb5_context,
-					FILE *, int, int *, void *));
-typedef krb5_error_code (*load_func)PROTOTYPE((char *, krb5_context,
-					       FILE *, int, int *, void *));
+			(krb5_pointer, krb5_db_entry *);
+static krb5_error_code dump_ov_princ (krb5_pointer,
+				      krb5_db_entry *);
+static void dump_k5beta7_policy (void *, osa_policy_ent_t);
+
+typedef krb5_error_code (*dump_func)(krb5_pointer,
+				     krb5_db_entry *);
+
+static int process_k5beta_record (char *, krb5_context,
+				  FILE *, int, int *, void *);
+static int process_k5beta6_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_k5beta7_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_ov_record (char *, krb5_context,
+			      FILE *, int, int *, void *);
+typedef krb5_error_code (*load_func)(char *, krb5_context,
+				     FILE *, int, int *, void *);
 
 typedef struct _dump_version {
      char *name;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index c6ff334..74210ab 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -93,10 +93,10 @@ struct iterate_args {
 };
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
-		   krb5_principal, 
-		   enum ap_op,
-		   struct realm_info *));
+	(krb5_context,
+	 krb5_principal,
+	 enum ap_op,
+	 struct realm_info *);
 
 /*
  * Steps in creating a database:
diff --git a/src/kadmin/dbutil/kdb5_util.h b/src/kadmin/dbutil/kdb5_util.h
index 8c72754..c63ca03 100644
--- a/src/kadmin/dbutil/kdb5_util.h
+++ b/src/kadmin/dbutil/kdb5_util.h
@@ -44,43 +44,43 @@ extern krb5_db_entry master_db;
 extern void usage(void);
 
 extern void add_key 
-	PROTOTYPE((char const *, char const *, 
+	(char const *, char const *, 
 		   krb5_const_principal, const krb5_keyblock *, 
-		   krb5_kvno, krb5_keysalt *));
+		   krb5_kvno, krb5_keysalt *);
 extern int set_dbname_help
-	PROTOTYPE((char *, char *));
+	(char *, char *);
 
-extern char *kdb5_util_Init PROTOTYPE((int, char **));
+extern char *kdb5_util_Init (int, char **);
 
-extern int quit PROTOTYPE((void));
+extern int quit (void);
 
 extern int check_for_match
-	PROTOTYPE((char *, int, krb5_db_entry *, int, int));
+	(char *, int, krb5_db_entry *, int, int);
 
 extern void parse_token
-	PROTOTYPE((char *, int *, int *, char *));
+	(char *, int *, int *, char *);
 
-extern int create_db_entry PROTOTYPE((krb5_principal, krb5_db_entry *));
+extern int create_db_entry (krb5_principal, krb5_db_entry *);
 
-extern int kadm5_create_magic_princs PROTOTYPE((kadm5_config_params *params,
-						krb5_context context));
+extern int kadm5_create_magic_princs (kadm5_config_params *params,
+						krb5_context context);
 
-extern int process_ov_principal PROTOTYPE((char *fname, krb5_context kcontext, 
+extern int process_ov_principal (char *fname, krb5_context kcontext, 
 					   FILE *filep, int verbose, 
 					   int *linenop,
-					   void *pol_db));
+					   void *pol_db);
 
-extern void load_db PROTOTYPE((int argc, char **argv));
-extern void dump_db PROTOTYPE((int argc, char **argv));
-extern void load_v4db PROTOTYPE((int argc, char **argv));
-extern void dump_v4db PROTOTYPE((int argc, char **argv));
-extern void kdb5_create PROTOTYPE((int argc, char **argv));
-extern void kdb5_destroy PROTOTYPE((int argc, char **argv));
-extern void kdb5_stash PROTOTYPE((int argc, char **argv));
+extern void load_db (int argc, char **argv);
+extern void dump_db (int argc, char **argv);
+extern void load_v4db (int argc, char **argv);
+extern void dump_v4db (int argc, char **argv);
+extern void kdb5_create (int argc, char **argv);
+extern void kdb5_destroy (int argc, char **argv);
+extern void kdb5_stash (int argc, char **argv);
 
-extern void update_ok_file PROTOTYPE((char *file_name));
+extern void update_ok_file (char *file_name);
 
-extern int kadm5_create PROTOTYPE((kadm5_config_params *params));
+extern int kadm5_create (kadm5_config_params *params);
 
-void usage PROTOTYPE((void));
+void usage (void);
 
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index a93f7aa..197d4bf 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -107,19 +107,19 @@ static int verbose = 0;
 static int shortlife = 0;
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
+		  (krb5_context,
 		   krb5_principal, 
 		   enum ap_op,
-		   struct realm_info *));
-
-static int v4init PROTOTYPE((char *, int, char *));
-static krb5_error_code enter_in_v5_db PROTOTYPE((krb5_context,
-						 char *, Principal *));
-static krb5_error_code process_v4_dump PROTOTYPE((krb5_context, char *,
-						  char *, long));
-static krb5_error_code v4_dump_find_default PROTOTYPE((krb5_context, char *,
-						       char *, long *));
-static krb5_error_code fixup_database PROTOTYPE((krb5_context, char *));
+		   struct realm_info *);
+
+static int v4init (char *, int, char *);
+static krb5_error_code enter_in_v5_db (krb5_context,
+				       char *, Principal *);
+static krb5_error_code process_v4_dump (krb5_context, char *,
+					char *, long);
+static krb5_error_code v4_dump_find_default (krb5_context, char *,
+					     char *, long *);
+static krb5_error_code fixup_database (krb5_context, char *);
 	
 static int create_local_tgt = 0;
 
diff --git a/src/kadmin/dbutil/tcl_wrapper.c b/src/kadmin/dbutil/tcl_wrapper.c
index ab4f25b..16721ae 100644
--- a/src/kadmin/dbutil/tcl_wrapper.c
+++ b/src/kadmin/dbutil/tcl_wrapper.c
@@ -40,8 +40,7 @@
     Tcl_Interp * interp;\
     int argc;\
     char ** argv;
-#define CMDPROTO(x) int x PROTOTYPE((ClientData, Tcl_Interp,\
-				     int, char **))
+#define CMDPROTO(x) int x (ClientData, Tcl_Interp, int, char **)
 #define MKCMD(name,cmd) Tcl_CreateCommand(interp, name, cmd,\
 					 (ClientData)NULL,\
 					 (Tcl_CmdDeleteProc *)NULL)
@@ -53,19 +52,19 @@ extern Tcl_Interp *interp;	/* XXX yes, this is gross,
 				   but we do need it for some things */
 extern int exit_status;
 
-void show_principal PROTOTYPE((int, char **));
-void add_new_key PROTOTYPE((int, char **));
-void change_pwd_key PROTOTYPE((int, char **));
-void add_rnd_key PROTOTYPE((int, char **));
-void change_rnd_key PROTOTYPE((int, char **));
-void delete_entry PROTOTYPE((int, char **));
-void extract_srvtab PROTOTYPE((krb5_context, int, char **));
-void extract_v4_srvtab PROTOTYPE((int, char **));
-void list_db PROTOTYPE((int, char **));
-void dump_db PROTOTYPE((int, char **));
-void load_db PROTOTYPE((int, char **));
-void set_dbname PROTOTYPE((krb5_context, int, char **));
-void enter_master_key PROTOTYPE((krb5_context, int, char **));
+void show_principal (int, char **);
+void add_new_key (int, char **);
+void change_pwd_key (int, char **);
+void add_rnd_key (int, char **);
+void change_rnd_key (int, char **);
+void delete_entry (int, char **);
+void extract_srvtab (krb5_context, int, char **);
+void extract_v4_srvtab (int, char **);
+void list_db (int, char **);
+void dump_db (int, char **);
+void load_db (int, char **);
+void set_dbname (krb5_context, int, char **);
+void enter_master_key (krb5_context, int, char **);
 
 /*
  * this is mostly stolen from tcl_ExitCmd()
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 789f0bc..e7bc046 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktutil.h: Make prototypes unconditional.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Find ktutil_ct.c in build directory.
diff --git a/src/kadmin/ktutil/ktutil.h b/src/kadmin/ktutil/ktutil.h
index 8d7d63e..d25c8d9 100644
--- a/src/kadmin/ktutil/ktutil.h
+++ b/src/kadmin/ktutil/ktutil.h
@@ -30,72 +30,46 @@ typedef struct _krb5_kt_list {
     krb5_keytab_entry *entry;
 } *krb5_kt_list;
 
-krb5_error_code ktutil_free_kt_list
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list));
+krb5_error_code ktutil_free_kt_list (krb5_context, krb5_kt_list);
 
-krb5_error_code ktutil_delete
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list *,
-			int));
+krb5_error_code ktutil_delete (krb5_context, krb5_kt_list *, int);
 
-krb5_error_code ktutil_add
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list *,
-			char *,
-			krb5_kvno,
-			char *,
-			int));
+krb5_error_code ktutil_add (krb5_context,
+			    krb5_kt_list *,
+			    char *,
+			    krb5_kvno,
+			    char *,
+			    int);
 
-krb5_error_code ktutil_read_keytab
-	KRB5_PROTOTYPE((krb5_context,
-			char *,
-			krb5_kt_list *));
+krb5_error_code ktutil_read_keytab (krb5_context,
+				    char *,
+				    krb5_kt_list *);
 
-krb5_error_code ktutil_write_keytab
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list,
-			char *));
+krb5_error_code ktutil_write_keytab (krb5_context,
+				     krb5_kt_list,
+				     char *);
 
 #ifdef KRB5_KRB4_COMPAT
-krb5_error_code ktutil_read_srvtab
-	KRB5_PROTOTYPE((krb5_context,
-			char *,
-			krb5_kt_list *));
-krb5_error_code ktutil_write_srvtab
-	KRB5_PROTOTYPE((krb5_context,
-			krb5_kt_list,
-			char *));
+krb5_error_code ktutil_read_srvtab (krb5_context,
+				    char *,
+				    krb5_kt_list *);
+krb5_error_code ktutil_write_srvtab (krb5_context,
+				     krb5_kt_list,
+				     char *);
 #endif
 
-void ktutil_add_entry
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_add_entry (int, char *[]);
 
-void ktutil_clear_list
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_clear_list (int, char *[]);
 
-void ktutil_read_v5
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_read_v5 (int, char *[]);
 
-void ktutil_read_v4
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_read_v4 (int, char *[]);
 
-void ktutil_write_v5
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_write_v5 (int, char *[]);
 
-void ktutil_write_v4
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_write_v4 (int, char *[]);
 
-void ktutil_delete_entry
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_delete_entry (int, char *[]);
 
-void ktutil_list
-	KRB5_PROTOTYPE((int,
-			char *[]));
+void ktutil_list (int, char *[]);
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index b295dde..2e567f4 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* adm_conn.c, adm_rw.c, kadm5_defs.h: Make prototypes
+	unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* adm_conn.c: Drop _MSDOS support.
diff --git a/src/kadmin/v5passwdd/adm_conn.c b/src/kadmin/v5passwdd/adm_conn.c
index 6459d3b..d9e6d82 100644
--- a/src/kadmin/v5passwdd/adm_conn.c
+++ b/src/kadmin/v5passwdd/adm_conn.c
@@ -49,30 +49,30 @@
  * Prototypes for local functions
  */
 static krb5_error_code kadm_get_ccache
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   char *,
 		   krb5_ccache *,
-		   krb5_principal *));
+		   krb5_principal *);
 static krb5_error_code kadm_get_creds
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_ccache ,
 		krb5_principal,
 		krb5_creds  *,
 		const char *,
 		char *,
-		krb5_timestamp));
+		krb5_timestamp);
 static krb5_error_code kadm_contact_server
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_data *,
 		int *,
 		krb5_address **,
-		krb5_address **));
+		krb5_address **);
 static krb5_error_code kadm_get_auth
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		krb5_auth_context *,
 		krb5_address *,
-		krb5_address *));
+		krb5_address *);
 
 /*
  * kadm_get_ccache()	- Initialze a credentials cache.
diff --git a/src/kadmin/v5passwdd/adm_rw.c b/src/kadmin/v5passwdd/adm_rw.c
index 08005a8..8b5c71a 100644
--- a/src/kadmin/v5passwdd/adm_rw.c
+++ b/src/kadmin/v5passwdd/adm_rw.c
@@ -35,8 +35,8 @@
 /*
  * Local prototypes (needed or else the PC will pass fail).
  */
-static void kadm_copyin_int32 PROTOTYPE((char *, krb5_int32 *));
-static void kadm_copyout_int32 PROTOTYPE((krb5_int32, char *));
+static void kadm_copyin_int32 (char *, krb5_int32 *);
+static void kadm_copyout_int32 (krb5_int32, char *);
 
 /*
  * Routines to [de]serialize integers.
diff --git a/src/kadmin/v5passwdd/kadm5_defs.h b/src/kadmin/v5passwdd/kadm5_defs.h
index 8201f29..3f587ea 100644
--- a/src/kadmin/v5passwdd/kadm5_defs.h
+++ b/src/kadmin/v5passwdd/kadm5_defs.h
@@ -110,14 +110,14 @@
  * Inter-module function prototypes
  */
 
-krb5_keytab key_keytab_id KRB5_PROTOTYPE((void));
-krb5_error_code key_open_db KRB5_PROTOTYPE((krb5_context));
-krb5_error_code key_close_db KRB5_PROTOTYPE((krb5_context));
+krb5_keytab key_keytab_id (void);
+krb5_error_code key_open_db (krb5_context);
+krb5_error_code key_close_db (krb5_context);
 
 #if 0
 /* srv_key.c */
 krb5_error_code key_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			int,
 			char *,
@@ -127,241 +127,241 @@ krb5_error_code key_init
 			char *,
 			char *,
 			krb5_int32,
-			krb5_key_salt_tuple *));
+			krb5_key_salt_tuple *);
 void key_finish
-	KRB5_PROTOTYPE((krb5_context,
-			int));
+	(krb5_context,
+			int);
 krb5_error_code key_string_to_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_data *,
 			krb5_int32,
 			krb5_key_salt_tuple *,
 			krb5_int32 *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_random_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_encrypt_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
 			krb5_key_data *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_error_code key_decrypt_keys
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_int32 *,
 			krb5_key_data *,
-			krb5_key_data **));
+			krb5_key_data **);
 krb5_boolean key_pwd_is_weak
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
-			krb5_data *));
+			krb5_data *);
 krb5_db_entry *key_master_entry();
 char *key_master_realm();
 krb5_keyblock *key_admin_key();
 krb5_encrypt_block *key_master_encblock();
-void key_free_key_data KRB5_PROTOTYPE((krb5_key_data *,
-				       krb5_int32));
+void key_free_key_data (krb5_key_data *,
+				       krb5_int32);
 krb5_error_code key_dbent_to_keysalts
-	KRB5_PROTOTYPE((krb5_db_entry *,
+	(krb5_db_entry *,
 			krb5_int32 *,
-			krb5_key_salt_tuple **));
+			krb5_key_salt_tuple **);
 krb5_error_code key_update_tl_attrs
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			krb5_db_entry *,
 			krb5_principal,
-			krb5_boolean));
+			krb5_boolean);
 
 /* srv_acl.c */
 krb5_error_code acl_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
-		   char *));
+		   char *);
 void acl_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_boolean acl_op_permitted
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_principal,
 		   krb5_int32,
-		   char *));
+		   char *);
 
 #endif
 
 /* srv_output.c */
 krb5_error_code output_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   char *,
-		   krb5_boolean));
+		   krb5_boolean);
 void output_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_boolean output_lang_supported
-	KRB5_PROTOTYPE((char *));
+	(char *);
 char *output_krb5_errmsg
-	KRB5_PROTOTYPE((char *,
+	(char *,
 		   krb5_boolean,
-		   krb5_int32));
+		   krb5_int32);
 char *output_adm_error
-	KRB5_PROTOTYPE((char *,
+	(char *,
 		   krb5_boolean,
 		   krb5_int32,
 		   krb5_int32,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 
 /* srv_net.c */
 krb5_error_code net_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   int,
-		   krb5_int32));
+		   krb5_int32);
 void net_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_error_code net_dispatch
-	KRB5_PROTOTYPE((krb5_context, int));
-krb5_principal net_server_princ KRB5_PROTOTYPE((void));
+	(krb5_context, int);
+krb5_principal net_server_princ (void);
 
 /* proto_serv.c */
 krb5_error_code proto_init
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
-		   int));
+		   int);
 void proto_finish
-	KRB5_PROTOTYPE((krb5_context,
-		   int));
+	(krb5_context,
+		   int);
 krb5_error_code proto_serv
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_int32,
 		   int,
 		   void *,
-		   void *));
+		   void *);
 
 krb5_int32 passwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 
 krb5_int32 pwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
 		   char [],
-		   unsigned int));
+		   unsigned int);
 
 #if 0
 
 /* passwd.c */
 krb5_int32 passwd_check
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_int32 passwd_change
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_auth_context,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_boolean passwd_check_npass_ok
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_principal,
 		   krb5_db_entry *,
 		   krb5_data *,
-		   krb5_int32 *));
+		   krb5_int32 *);
 krb5_boolean passwd_check_opass_ok
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_principal,
 		   krb5_db_entry *,
-		   krb5_data *));
+		   krb5_data *);
 
 /* admin.c */
 krb5_error_code admin_add_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_delete_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_rename_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_modify_principal
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_int32,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_change_opw
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_change_orandpw
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
-		   krb5_data *));
+		   krb5_data *);
 krb5_error_code admin_inquire
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_int32 *,
-		   krb5_data **));
+		   krb5_data **);
 krb5_error_code admin_extract_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   int,
 		   krb5_ticket *,
 		   krb5_data *,
 		   krb5_data *,
 		   krb5_int32 *,
-		   krb5_data **));
+		   krb5_data **);
 krb5_error_code admin_add_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			krb5_ticket *,
 			krb5_int32,
-			krb5_data *));
+			krb5_data *);
 krb5_error_code admin_delete_key
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 			int,
 			krb5_ticket *,
 			krb5_int32,
-			krb5_data *));
-void admin_init KRB5_PROTOTYPE((krb5_deltat,
+			krb5_data *);
+void admin_init (krb5_deltat,
 				krb5_deltat,
 				krb5_boolean,
 				krb5_timestamp,
 				krb5_boolean,
-				krb5_flags));
+				krb5_flags);
 #endif
 
 #endif	/* KADM5_DEFS_H__ */