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

4 files changed, 51 insertions, 47 deletions

diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 23c28a3..b57895d 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* rc_dfl.h, rc_io.h, ser_rc.c: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* rc_io.c: Drop _MSDOS support.
diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h
index aaa5e82..51c62ef 100644
--- a/src/lib/krb5/rcache/rc_dfl.h
+++ b/src/lib/krb5/rcache/rc_dfl.h
@@ -16,41 +16,41 @@
 extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */
 
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init 
-    	PROTOTYPE((krb5_context,
+    	(krb5_context,
 		   krb5_rcache,
-		   krb5_deltat));
+		   krb5_deltat);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache)); 
+	(krb5_context,
+		   krb5_rcache); 
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   krb5_donot_replay *));
+		   krb5_donot_replay *);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   krb5_deltat *));
+		   krb5_deltat *);
 char * KRB5_CALLCONV krb5_rc_dfl_get_name 
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rcache,
-		   char *));
+		   char *);
 krb5_error_code krb5_rc_dfl_close_no_free
-	PROTOTYPE((krb5_context,
-		   krb5_rcache));
+	(krb5_context,
+		   krb5_rcache);
 void krb5_rc_free_entry 
-	PROTOTYPE((krb5_context,
-		   krb5_donot_replay **));
+	(krb5_context,
+		   krb5_donot_replay **);
 #endif
 
diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h
index 8a1c241..77eb34f 100644
--- a/src/lib/krb5/rcache/rc_io.h
+++ b/src/lib/krb5/rcache/rc_io.h
@@ -28,43 +28,43 @@ krb5_rc_iostuff;
 /* first argument is always iostuff for result file */
 
 krb5_error_code krb5_rc_io_creat 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   char **));
+		   char **);
 krb5_error_code krb5_rc_io_open 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   char *));
+		   char *);
 krb5_error_code krb5_rc_io_move 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
-		   krb5_rc_iostuff *));
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_write 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
 		   krb5_pointer,
-		   unsigned int));
+		   unsigned int);
 krb5_error_code krb5_rc_io_read 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   krb5_rc_iostuff *,
 		   krb5_pointer,
-		   unsigned int));
+		   unsigned int);
 krb5_error_code krb5_rc_io_close 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_destroy 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_mark 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_unmark 
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 krb5_error_code krb5_rc_io_sync
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 long krb5_rc_io_size
-	PROTOTYPE((krb5_context,
-		   krb5_rc_iostuff *));
+	(krb5_context,
+		   krb5_rc_iostuff *);
 #endif
diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c
index 2df993f..a4ed0f8 100644
--- a/src/lib/krb5/rcache/ser_rc.c
+++ b/src/lib/krb5/rcache/ser_rc.c
@@ -37,11 +37,11 @@
  *	krb5_rcache_internalize();
  */
 static krb5_error_code krb5_rcache_size
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *));
+	(krb5_context, krb5_pointer, size_t *);
 static krb5_error_code krb5_rcache_externalize
-	KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *));
+	(krb5_context, krb5_pointer, krb5_octet **, size_t *);
 static krb5_error_code krb5_rcache_internalize
-	KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *));
+	(krb5_context,krb5_pointer *, krb5_octet **, size_t *);
 
 /*
  * Serialization entry for this type.