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

2 files changed, 20 insertions, 16 deletions

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 973583a7f0..732b8ebd70 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* stdcc.h: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index e2d1131688..705cdf5f2e 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -26,50 +26,50 @@ typedef struct _stdccCacheData {
 /* function protoypes  */
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_close
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_destroy 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_end_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_generate_new 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id ));
+        (krb5_context, krb5_ccache *id );
 
 const char * KRB5_CALLCONV krb5_stdcc_get_name 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id ));
+        (krb5_context, krb5_ccache id );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_get_principal 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
+        (krb5_context, krb5_ccache id , krb5_principal *princ );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_initialize 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
+        (krb5_context, krb5_ccache id , krb5_principal princ );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_next_cred 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_resolve 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual ));
+        (krb5_context, krb5_ccache *id , const char *residual );
      
 krb5_error_code KRB5_CALLCONV krb5_stdcc_retrieve 
-        KRB5_PROTOTYPE((krb5_context, 
+        (krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
 		   krb5_creds *mcreds , 
-		   krb5_creds *creds ));
+		   krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_start_seq_get 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
+        (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_store 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
+        (krb5_context, krb5_ccache id , krb5_creds *creds );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_set_flags 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
+        (krb5_context, krb5_ccache id , krb5_flags flags );
 
 krb5_error_code KRB5_CALLCONV krb5_stdcc_remove 
-        KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds));
+        (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds);