summaryrefslogtreecommitdiffstats
path: root/src/kadmin/ktutil
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2001-10-10 03:18:22 +0000
committerKen Raeburn <raeburn@mit.edu>2001-10-10 03:18:22 +0000
commit7613acc70e37ebabd7743da02da4f4ff0d218d5c (patch)
treeea7b08ad73cfb7cd8a5ca8e77a9fb646770804f0 /src/kadmin/ktutil
parentad4d9f8d0f83524931da62aebb592ab53f2218d9 (diff)
downloadkrb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.gz
krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.tar.xz
krb5-7613acc70e37ebabd7743da02da4f4ff0d218d5c.zip
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
Diffstat (limited to 'src/kadmin/ktutil')
-rw-r--r--src/kadmin/ktutil/ChangeLog4
-rw-r--r--src/kadmin/ktutil/ktutil.h82
2 files changed, 32 insertions, 54 deletions
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 789f0bc0b..e7bc046c3 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 8d7d63e48..d25c8d998 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 *[]);