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

6 files changed, 57 insertions, 52 deletions

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 2b52681df..62f53135a 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb_db2.c, kdb_db2.h, kdb_dbm.c, keytab.c, t_kdb.c: Make
+	prototypes unconditional.
+
 2001-07-26  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb_xdr.c (krb5_dbe_update_mod_princ_data,
diff --git a/src/lib/kdb/kdb_db2.c b/src/lib/kdb/kdb_db2.c
index c471996bf..9c6e4fcef 100644
--- a/src/lib/kdb/kdb_db2.c
+++ b/src/lib/kdb/kdb_db2.c
@@ -70,13 +70,13 @@
 #include "kdb_db2.h"
 
 static char *gen_dbsuffix 
-	PROTOTYPE((char *, char * ));
+	(char *, char * );
 static krb5_error_code krb5_db2_db_start_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_db2_db_end_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_db2_db_set_hashfirst
-	PROTOTYPE((krb5_context, int));
+	(krb5_context, int);
 
 static char default_db_name[] = DEFAULT_KDB_FILE;
 
@@ -1121,7 +1121,7 @@ cleanup:
 krb5_error_code
 krb5_db2_db_iterate (context, func, func_arg)
     krb5_context context;
-    krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *));
+    krb5_error_code (*func) (krb5_pointer, krb5_db_entry *);
     krb5_pointer func_arg;
 {
     krb5_db2_context *db_ctx;
diff --git a/src/lib/kdb/kdb_db2.h b/src/lib/kdb/kdb_db2.h
index fd35c8113..2d4d8e947 100644
--- a/src/lib/kdb/kdb_db2.h
+++ b/src/lib/kdb/kdb_db2.h
@@ -69,56 +69,56 @@ typedef struct _krb5_db2_context {
 #define KDB2_LOCK_EXT ".ok"
 
 krb5_error_code krb5_db2_db_set_name 
-	KRB5_PROTOTYPE((krb5_context,
-		   char * ));
+	(krb5_context,
+		   char * );
 krb5_error_code krb5_db2_db_init 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_fini 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_get_age 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   time_t * ));
+		   time_t * );
 krb5_error_code krb5_db2_db_create 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   krb5_int32));
+		   krb5_int32);
 krb5_error_code krb5_db2_db_destroy 
-	KRB5_PROTOTYPE((krb5_context,
-		   char * ));
+	(krb5_context,
+		   char * );
 krb5_error_code krb5_db2_db_rename 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
-		   char * ));
+		   char * );
 krb5_error_code krb5_db2_db_get_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_const_principal,
 		   krb5_db_entry *,
 		   int *,
-		   krb5_boolean * ));
+		   krb5_boolean * );
 void krb5_db2_db_free_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_db_entry *,
-		   int ));
+		   int );
 krb5_error_code krb5_db2_db_put_principal 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_db_entry *,
-		   int * ));
+		   int * );
 krb5_error_code krb5_db2_db_iterate
-    	KRB5_PROTOTYPE((krb5_context,
-		   krb5_error_code (*) KRB5_PROTOTYPE((krb5_pointer,
-					          krb5_db_entry *)),
-	           krb5_pointer ));
+    	(krb5_context,
+		   krb5_error_code (*) (krb5_pointer,
+					          krb5_db_entry *),
+	           krb5_pointer );
 krb5_error_code krb5_db2_db_set_nonblocking 
-	KRB5_PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_boolean,
-		   krb5_boolean * ));
+		   krb5_boolean * );
 krb5_boolean krb5_db2_db_set_lockmode
-	KRB5_PROTOTYPE((krb5_context,
-		   krb5_boolean ));
+	(krb5_context,
+		   krb5_boolean );
 krb5_error_code krb5_db2_db_open_database 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 krb5_error_code krb5_db2_db_close_database 
-	KRB5_PROTOTYPE((krb5_context));
+	(krb5_context);
 
 #endif /* KRB5_KDB_DB2_H */
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index 003ba3ea5..4769ba9c7 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -54,11 +54,11 @@ extern char *progname;
 static char default_db_name[] = DEFAULT_KDB_FILE;
 
 static char *gen_dbsuffix 
-	PROTOTYPE((char *, char * ));
+	(char *, char * );
 static krb5_error_code krb5_dbm_db_start_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 static krb5_error_code krb5_dbm_db_end_update 
-	PROTOTYPE((krb5_context));
+	(krb5_context);
 
 /*
  * This module contains all of the code which directly interfaces to
@@ -1132,7 +1132,7 @@ cleanup:
 krb5_error_code
 krb5_dbm_db_iterate (context, func, func_arg)
     krb5_context context;
-    krb5_error_code (*func) PROTOTYPE((krb5_pointer, krb5_db_entry *));
+    krb5_error_code (*func) (krb5_pointer, krb5_db_entry *);
     krb5_pointer func_arg;
 {
     datum key, contents;
diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
index 1e5025c65..222e2d900 100644
--- a/src/lib/kdb/keytab.c
+++ b/src/lib/kdb/keytab.c
@@ -28,10 +28,10 @@
 #include "k5-int.h"
 #include "kdb_kt.h"
 
-krb5_error_code krb5_ktkdb_close KRB5_PROTOTYPE((krb5_context, krb5_keytab));
+krb5_error_code krb5_ktkdb_close (krb5_context, krb5_keytab);
 
-krb5_error_code krb5_ktkdb_get_entry KRB5_PROTOTYPE((krb5_context, krb5_keytab, krb5_const_principal,
-		   krb5_kvno, krb5_enctype, krb5_keytab_entry *));
+krb5_error_code krb5_ktkdb_get_entry (krb5_context, krb5_keytab, krb5_const_principal,
+		   krb5_kvno, krb5_enctype, krb5_keytab_entry *);
 
 krb5_kt_ops krb5_kt_kdb_ops = {
     0,
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index 10e6163fb..b49e09d6b 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -84,16 +84,16 @@ krb5_principal	*recorded_principals = (krb5_principal *) NULL;
 char		**recorded_names = (char **) NULL;
 
 #ifdef BERK_DB_DBM
-extern DBM	*db_dbm_open PROTOTYPE((char *, int, int));
-extern void     db_dbm_close PROTOTYPE((DBM *));
-extern datum    db_dbm_fetch PROTOTYPE((DBM *, datum));
-extern datum    db_dbm_firstkey PROTOTYPE((DBM *));
-extern datum    db_dbm_nextkey PROTOTYPE((DBM *));
-extern int      db_dbm_delete PROTOTYPE((DBM *, datum));
-extern int      db_dbm_store PROTOTYPE((DBM *, datum, datum, int));
-extern int	db_dbm_error PROTOTYPE((DBM *));
-extern int	db_dbm_clearerr PROTOTYPE((DBM *));
-extern int	db_dbm_dirfno PROTOTYPE((DBM *));
+extern DBM	*db_dbm_open (char *, int, int);
+extern void     db_dbm_close (DBM *);
+extern datum    db_dbm_fetch (DBM *, datum);
+extern datum    db_dbm_firstkey (DBM *);
+extern datum    db_dbm_nextkey (DBM *);
+extern int      db_dbm_delete (DBM *, datum);
+extern int      db_dbm_store (DBM *, datum, datum, int);
+extern int	db_dbm_error (DBM *);
+extern int	db_dbm_clearerr (DBM *);
+extern int	db_dbm_dirfno (DBM *);
 
 static kdb5_dispatch_table berkeley_dispatch = {
     "Berkeley Hashed Database",
@@ -121,10 +121,10 @@ static kdb5_dispatch_table berkeley_dispatch = {
  * (e.g. NetBSD-1.0)
  */
 #ifdef MISSING_ERROR_PROTO
-int dbm_error PROTOTYPE((DBM *));
+int dbm_error (DBM *);
 #endif
 #ifdef MISSING_CLEARERR_PROTO
-int dbm_clearerr PROTOTYPE((DBM *));
+int dbm_clearerr (DBM *);
 #endif
 
 static kdb5_dispatch_table dbm_dispatch = {