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

5 files changed, 14 insertions, 9 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 84106b5e6..881f09fb1 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* cr_tkt.c, decomp_tkt.c, g_in_tkt.c, tf_util.c: Make prototypes
+	unconditional.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* dest_tkt.c, err_txt.c, g_admhst.c, g_cred.c, g_krbhst.c,
diff --git a/src/lib/krb4/cr_tkt.c b/src/lib/krb4/cr_tkt.c
index b688f8468..74c4529f0 100644
--- a/src/lib/krb4/cr_tkt.c
+++ b/src/lib/krb4/cr_tkt.c
@@ -31,11 +31,11 @@
 #include <string.h>
 
 static int
-krb_cr_tkt_int PROTOTYPE((KTEXT tkt, unsigned int flags_in, char *pname, 
+krb_cr_tkt_int (KTEXT tkt, unsigned int flags_in, char *pname, 
 			  char *pinstance, char *prealm, long paddress,
 			  char *session, int life, long time_sec, 
 			  char *sname, char *sinstance, C_Block key, 
-			  krb5_keyblock *k5key));
+			  krb5_keyblock *k5key);
 
 /*
  * Create ticket takes as arguments information that should be in a
diff --git a/src/lib/krb4/decomp_tkt.c b/src/lib/krb4/decomp_tkt.c
index 84419d5b5..2508afac4 100644
--- a/src/lib/krb4/decomp_tkt.c
+++ b/src/lib/krb4/decomp_tkt.c
@@ -35,12 +35,12 @@
 extern int krb_debug;
 #endif
 
-static int dcmp_tkt_int PROTOTYPE((KTEXT tkt, unsigned char *flags, 
+static int dcmp_tkt_int (KTEXT tkt, unsigned char *flags, 
 				   char *pname, char *pinstance, char *prealm,
 				   unsigned KRB4_32 *paddress, C_Block session,
 				   int *life, unsigned KRB4_32 *time_sec, 
 				   char *sname, char *sinstance, C_Block key, 
-				   Key_schedule key_s, krb5_keyblock *k5key));
+				   Key_schedule key_s, krb5_keyblock *k5key);
 /*
  * This routine takes a ticket and pointers to the variables that
  * should be filled in based on the information in the ticket.  It
diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c
index 32f51c1cd..16b19660d 100644
--- a/src/lib/krb4/g_in_tkt.c
+++ b/src/lib/krb4/g_in_tkt.c
@@ -36,12 +36,12 @@
    in <krb-sed.h>, but the code below is too opaque if you can't also
    see them here.  */
 #ifndef	KEY_PROC_TYPE_DEFINED
-typedef int (*key_proc_type) PROTOTYPE ((char *, char *, char *,
-					     char *, C_Block));
+typedef int (*key_proc_type) (char *, char *, char *,
+					     char *, C_Block);
 #endif
 #ifndef	DECRYPT_TKT_TYPE_DEFINED
-typedef int (*decrypt_tkt_type) PROTOTYPE ((char *, char *, char *, char *,
-				     key_proc_type, KTEXT *));
+typedef int (*decrypt_tkt_type) (char *, char *, char *, char *,
+				     key_proc_type, KTEXT *);
 #endif
 
 static int
diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index 333961b4e..85f88d6a1 100644
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -112,7 +112,7 @@ static int  curpos;			/* Position in tfbfr */
 static int  lastpos;			/* End of tfbfr */
 static char tfbfr[BUFSIZ];		/* Buffer for ticket data */
 
-static int tf_gets PROTOTYPE((char *, int)), tf_read PROTOTYPE((char *, int));
+static int tf_gets (char *, int), tf_read (char *, int);
 
 /*
  * This file contains routines for manipulating the ticket cache file.