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

1 files changed, 28 insertions, 54 deletions

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 *[]);