Windows global stuff:

 o removed INTERFACE from non-api functions
 o add FAR to pointers visible to the world
 o made the tests for __STDC__ also check for _WINDOWS
 o creates GSSAPI.DLL & GSSAPI.LIB as per spec.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5354 dc483132-0cff-0310-8789-dd5450dbe970

59 files changed, 101 insertions, 97 deletions

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index c591d11..7dd6e6a 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com)
+
+	* *.[ch]: removed unneeded INTERFACE from non-api functions.
+
 Fri Mar 31 16:45:47 1995 Keith Vetter (keithv@fusion.com)
 
 	* krb5_get_in_tkt: changed error return value for when clocks
diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c
index f63ea02..661f696 100644
--- a/src/lib/krb5/krb/addr_comp.c
+++ b/src/lib/krb5/krb/addr_comp.c
@@ -29,7 +29,7 @@
 /*
  * If the two addresses are the same, return TRUE, else return FALSE
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_address_compare(context, addr1, addr2)
     krb5_context context;
     const krb5_address *addr1;
diff --git a/src/lib/krb5/krb/addr_order.c b/src/lib/krb5/krb/addr_order.c
index c872c52..757f7bf 100644
--- a/src/lib/krb5/krb/addr_order.c
+++ b/src/lib/krb5/krb/addr_order.c
@@ -34,7 +34,7 @@
  * Return an ordering on two addresses:  0 if the same,
  * < 0 if first is less than 2nd, > 0 if first is greater than 2nd.
  */
-int INTERFACE
+int
 krb5_address_order(context, addr1, addr2)
     krb5_context context;
     register const krb5_address *addr1;
diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c
index 2e112ea..d30b68c 100644
--- a/src/lib/krb5/krb/addr_srch.c
+++ b/src/lib/krb5/krb/addr_srch.c
@@ -30,7 +30,7 @@
  * if addr is listed in addrlist, or addrlist is null, return TRUE.
  * if not listed, return FALSE
  */
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_address_search(context, addr, addrlist)
     krb5_context context;
     const krb5_address *addr;
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index ebf72a7..134e07b 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -2,7 +2,7 @@
 #include "k5-int.h"
 #include "auth_con.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_init(context, auth_context)
     krb5_context      	  context;
     krb5_auth_context  ** auth_context;
@@ -21,7 +21,7 @@ krb5_auth_con_init(context, auth_context)
     return ENOMEM;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_free(context, auth_context)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -38,7 +38,7 @@ krb5_auth_con_free(context, auth_context)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -51,7 +51,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
 }
 
 /* XXX this call is a hack. Fixed when I do the servers. */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -69,7 +69,7 @@ krb5_auth_con_setkey(context, auth_context, keyblock)
  * Once decrypted this key is no longer necessary and is then overwritten
  * with the session key sent by the client.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -80,7 +80,7 @@ krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     return(krb5_copy_keyblock(context, keyblock, &(auth_context->keyblock)));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -92,7 +92,7 @@ krb5_auth_con_getkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -104,7 +104,7 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -116,7 +116,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -126,7 +126,7 @@ krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -136,7 +136,7 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getauthenticator(context, auth_context, authenticator)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -146,7 +146,7 @@ krb5_auth_con_getauthenticator(context, auth_context, authenticator)
 				    authenticator));
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -156,7 +156,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_initivector(context, auth_context)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -174,7 +174,7 @@ krb5_auth_con_initivector(context, auth_context)
     return EINVAL; /* XXX need an error for no keyblock */
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setivector(context, auth_context, ivector)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -184,7 +184,7 @@ krb5_auth_con_setivector(context, auth_context, ivector)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_getivector(context, auth_context, ivector)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -194,7 +194,7 @@ krb5_auth_con_getivector(context, auth_context, ivector)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setflags(context, auth_context, flags)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
@@ -204,7 +204,7 @@ krb5_auth_con_setflags(context, auth_context, flags)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_auth_con_setrcache(context, auth_context, rcache)
     krb5_context      	  context;
     krb5_auth_context 	* auth_context;
diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 289a0bf..d2dc469 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -33,7 +33,7 @@
 #include <varargs.h>
 #endif
 
-krb5_error_code INTERFACE_C
+krb5_error_code
 krb5_build_principal_va(context, princ, rlen, realm, ap)
     krb5_context context;
     krb5_principal princ;
@@ -96,7 +96,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap)
     return 0;
 }
 
-krb5_error_code INTERFACE_C
+krb5_error_code
 #ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, int rlen,
     const char * realm, ...)
diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c
index 2159915..75794e8 100644
--- a/src/lib/krb5/krb/chk_trans.c
+++ b/src/lib/krb5/krb/chk_trans.c
@@ -25,7 +25,7 @@
 
 #define MAX_REALM_LN 500
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_check_transited_list(context, trans, realm1, realm2)
     krb5_context context;
 krb5_data      *trans;
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index e1b90c9..e76bf9b 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -99,7 +99,7 @@ static char *strnchr(s, c, n)
 /* XXX This calls for a new error code */
 #define KRB5_INVALID_PRINCIPAL KRB5_LNAME_BADFORMAT
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_524_conv_principal(context, princ, name, inst, realm)
     krb5_context context;
     const krb5_principal princ;
@@ -167,7 +167,7 @@ krb5_524_conv_principal(context, princ, name, inst, realm)
      return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_425_conv_principal(context, name, instance, realm, princ)
    krb5_context context;
    const char	*name;
diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c
index 29c97ce..fa37731 100644
--- a/src/lib/krb5/krb/copy_addrs.c
+++ b/src/lib/krb5/krb/copy_addrs.c
@@ -49,7 +49,7 @@ krb5_address **outad;
 /*
  * Copy an address array, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_addresses(context, inaddr, outaddr)
     krb5_context context;
     krb5_address * const * inaddr;
@@ -87,7 +87,7 @@ krb5_copy_addresses(context, inaddr, outaddr)
  * Note that this function may change the value of *outaddr even if it
  * returns failure, but it will not change the contents of the list.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_append_addresses(context, inaddr, outaddr)
     krb5_context context;
 	krb5_address * const * inaddr;
diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c
index 826db0e..5523f31 100644
--- a/src/lib/krb5/krb/copy_athctr.c
+++ b/src/lib/krb5/krb/copy_athctr.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_authenticator(context, authfrom, authto)
     krb5_context context;
 const krb5_authenticator *authfrom;
diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
index 993d084..23c91dc 100644
--- a/src/lib/krb5/krb/copy_auth.c
+++ b/src/lib/krb5/krb/copy_auth.c
@@ -49,7 +49,7 @@ krb5_authdata **outad;
 /*
  * Copy an authdata array, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_authdata(context, inauthdat, outauthdat)
     krb5_context context;
 krb5_authdata * const * inauthdat;
diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c
index c7ebb8c..4d8d3ef 100644
--- a/src/lib/krb5/krb/copy_cksum.c
+++ b/src/lib/krb5/krb/copy_cksum.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_checksum(context, ckfrom, ckto)
     krb5_context context;
     const krb5_checksum *ckfrom;
diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c
index 264ca51..1b58af9 100644
--- a/src/lib/krb5/krb/copy_creds.c
+++ b/src/lib/krb5/krb/copy_creds.c
@@ -30,7 +30,7 @@
  * Copy credentials, allocating fresh storage where needed.
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_creds(context, incred, outcred)
     krb5_context context;
     const krb5_creds *incred;
diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c
index fedf2dc..e9dd229 100644
--- a/src/lib/krb5/krb/copy_data.c
+++ b/src/lib/krb5/krb/copy_data.c
@@ -29,7 +29,7 @@
 /*
  * Copy a data structure, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_data(context, indata, outdata)
     krb5_context context;
     const krb5_data *indata;
diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c
index 6e367d4..065b66e 100644
--- a/src/lib/krb5/krb/copy_key.c
+++ b/src/lib/krb5/krb/copy_key.c
@@ -29,7 +29,7 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_keyblock(context, from, to)
     krb5_context context;
     const krb5_keyblock *from;
diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
index 4e7fb99..d8e47de 100644
--- a/src/lib/krb5/krb/copy_princ.c
+++ b/src/lib/krb5/krb/copy_princ.c
@@ -29,7 +29,7 @@
 /*
  * Copy a principal structure, with fresh allocation.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_principal(context, inprinc, outprinc)
     krb5_context context;
     krb5_const_principal inprinc;
diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c
index b1e05e8..3d9b99a 100644
--- a/src/lib/krb5/krb/copy_tick.c
+++ b/src/lib/krb5/krb/copy_tick.c
@@ -91,7 +91,7 @@ krb5_copy_enc_tkt_part(context, partfrom, partto)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_ticket(context, from, pto)
     krb5_context context;
     const krb5_ticket *from;
diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c
index b4afc2e..fd32cae 100644
--- a/src/lib/krb5/krb/cp_key_cnt.c
+++ b/src/lib/krb5/krb/cp_key_cnt.c
@@ -29,7 +29,7 @@
 /*
  * Copy a keyblock, including alloc'ed storage.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_copy_keyblock_contents(context, from, to)
     krb5_context context;
     const krb5_keyblock *from;
diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c
index 007b2ab..642de5b 100644
--- a/src/lib/krb5/krb/decode_kdc.c
+++ b/src/lib/krb5/krb/decode_kdc.c
@@ -39,7 +39,7 @@
  returns errors from encryption routines, system errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_decode_kdc_rep(context, enc_rep, key, etype, dec_rep)
     krb5_context context;
     krb5_data * enc_rep;
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index 3307124..3777ffa 100644
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -35,7 +35,7 @@
 
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_decrypt_tkt_part(context, srv_key, ticket)
     krb5_context context;
     const krb5_keyblock *srv_key;
diff --git a/src/lib/krb5/krb/encode_kdc.c b/src/lib/krb5/krb/encode_kdc.c
index 5b72dc4..a4d0edb 100644
--- a/src/lib/krb5/krb/encode_kdc.c
+++ b/src/lib/krb5/krb/encode_kdc.c
@@ -40,7 +40,7 @@
 */
 /* due to argument promotion rules, we need to use the DECLARG/OLDDECLARG
    stuff... */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_encode_kdc_rep(context, type, encpart, eblock, client_key, dec_rep, enc_rep)
     krb5_context context;
     const krb5_msgtype type;
diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c
index 65cbd74..101b6b7 100644
--- a/src/lib/krb5/krb/encrypt_tk.c
+++ b/src/lib/krb5/krb/encrypt_tk.c
@@ -38,7 +38,7 @@
  enc_part->ciphertext.data allocated & filled in with encrypted stuff
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_encrypt_tkt_part(context, eblock, srv_key, dec_ticket)
     krb5_context context;
     krb5_encrypt_block *eblock;
diff --git a/src/lib/krb5/krb/faddr_ordr.c b/src/lib/krb5/krb/faddr_ordr.c
index 1afb65a..6294993 100644
--- a/src/lib/krb5/krb/faddr_ordr.c
+++ b/src/lib/krb5/krb/faddr_ordr.c
@@ -34,7 +34,7 @@
  * Return an ordering on the two full addresses:  0 if the same,
  * < 0 if first is less than 2nd, > 0 if first is greater than 2nd.
  */
-int INTERFACE
+int
 krb5_fulladdr_order(context, addr1, addr2)
     krb5_context context;
     register const krb5_fulladdr *addr1;
diff --git a/src/lib/krb5/krb/free_rtree.c b/src/lib/krb5/krb/free_rtree.c
index b3b70e4..5849271 100644
--- a/src/lib/krb5/krb/free_rtree.c
+++ b/src/lib/krb5/krb/free_rtree.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-void INTERFACE
+void
 krb5_free_realm_tree(context, realms)
     krb5_context context;
     krb5_principal *realms;
diff --git a/src/lib/krb5/krb/gc_2tgt.c b/src/lib/krb5/krb/gc_2tgt.c
index 5689f1e..9f9106f 100644
--- a/src/lib/krb5/krb/gc_2tgt.c
+++ b/src/lib/krb5/krb/gc_2tgt.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "int-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_via_2tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred)
     krb5_context context;
     krb5_creds *tgt;
diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c
index daf14ca..30e278d 100644
--- a/src/lib/krb5/krb/gc_frm_kdc.c
+++ b/src/lib/krb5/krb/gc_frm_kdc.c
@@ -63,7 +63,7 @@ extern krb5_cksumtype krb5_kdc_req_sumtype;
 #define TGT_ETYPE \
       krb5_keytype_array[tgt.keyblock.keytype]->system->proto_enctype;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_from_kdc(context, ccache, in_cred, out_cred, tgts)
     krb5_context context;
     krb5_ccache ccache;
diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c
index de9dae5..c0d31c2 100644
--- a/src/lib/krb5/krb/gc_via_tgt.c
+++ b/src/lib/krb5/krb/gc_via_tgt.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "int-proto.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_cred_via_tgt (context, tgt, kdcoptions, sumtype, in_cred, out_cred)
     krb5_context context;
     krb5_creds * tgt;
diff --git a/src/lib/krb5/krb/gen_seqnum.c b/src/lib/krb5/krb/gen_seqnum.c
index 4befc40..ec6e032 100644
--- a/src/lib/krb5/krb/gen_seqnum.c
+++ b/src/lib/krb5/krb/gen_seqnum.c
@@ -32,7 +32,7 @@
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_generate_seq_number(context, key, seqno)
     krb5_context context;
     const krb5_keyblock *key;
diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c
index a326f2f..bd8ae4b 100644
--- a/src/lib/krb5/krb/gen_subkey.c
+++ b/src/lib/krb5/krb/gen_subkey.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_generate_subkey(context, key, subkey)
     krb5_context context;
     const krb5_keyblock *key;
diff --git a/src/lib/krb5/krb/get_fcreds.c b/src/lib/krb5/krb/get_fcreds.c
index e0a2630..7c08022 100644
--- a/src/lib/krb5/krb/get_fcreds.c
+++ b/src/lib/krb5/krb/get_fcreds.c
@@ -39,7 +39,7 @@
 #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK)
 
 /* Get a TGT for use at the remote host */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_for_creds(context, sumtype, rhost, client, enc_key, 
 		   forwardable, outbuf)
     krb5_context context;
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 42dcdb4..ed34087 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -60,17 +60,17 @@ extern krb5_deltat krb5_clockskew;
 
 /* some typedef's for the function args to make things look a bit cleaner */
 
-typedef krb5_error_code (INTERFACE *git_key_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context,
 						   const krb5_keytype,
 						   krb5_data *,
 						   krb5_const_pointer,
 						   krb5_keyblock **));
 
-typedef krb5_error_code (INTERFACE *git_decrypt_proc) PROTOTYPE((krb5_context,
+typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context,
 						       const krb5_keyblock *,
 						       krb5_const_pointer,
 						       krb5_kdc_rep * ));
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt(context, options, addrs, etypes, ptypes, key_proc, keyseed,
 		decrypt_proc, decryptarg, creds, ccache, ret_as_reply)
     krb5_context context;
diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c
index 7b0858e..29701cc 100644
--- a/src/lib/krb5/krb/in_tkt_ktb.c
+++ b/src/lib/krb5/krb/in_tkt_ktb.c
@@ -37,14 +37,14 @@ struct keytab_keyproc_arg {
  * "keyseed" is actually a krb5_keytab, or NULL if we should fetch
  * from system area.
  */
-krb5_error_code INTERFACE keytab_keyproc
+krb5_error_code keytab_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 keytab_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
@@ -107,7 +107,7 @@ keytab_keyproc(context, type, salt, keyseed, key)
  returns system errors, encryption errors
 
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt_with_keytab(context, options, addrs, etypes, pre_auth_types, 
 			    keytab, ccache, creds, ret_as_reply)
     krb5_context context;
diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index c288063..2c899bf 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -31,14 +31,14 @@ extern char *krb5_default_pwd_prompt1;
 /* 
  * key-producing procedure for use by krb5_get_in_tkt_with_password.
  */
-krb5_error_code INTERFACE pwd_keyproc
+krb5_error_code pwd_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 pwd_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index b8378e1..ab5d24c 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -37,14 +37,14 @@ struct skey_keyproc_arg {
  * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch
  * from system area.
  */
-krb5_error_code INTERFACE skey_keyproc
+krb5_error_code skey_keyproc
     PROTOTYPE((krb5_context,
                const krb5_keytype,
                krb5_data *,
                krb5_const_pointer,
                krb5_keyblock **));
 
-krb5_error_code INTERFACE
+krb5_error_code
 skey_keyproc(context, type, salt, keyseed, key)
     krb5_context context;
     const krb5_keytype type;
@@ -94,7 +94,7 @@ skey_keyproc(context, type, salt, keyseed, key)
  returns system errors, encryption errors
 
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_in_tkt_with_skey(context, options, addrs, etypes, pre_auth_types, 
 			  key, ccache, creds, ret_as_reply)
     krb5_context context;
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index d137c29..9daa66b 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -55,7 +55,7 @@ cleanup:
 	return retval;
 }
 
-void INTERFACE
+void
 krb5_free_context(ctx)
 	krb5_context	ctx;
 {
@@ -71,7 +71,7 @@ krb5_free_context(ctx)
 /*
  * Set the desired default etypes, making sure they are valid.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_set_default_in_tkt_etypes(context, etypes)
 	krb5_context context;
 	const krb5_enctype *etypes;
@@ -110,7 +110,7 @@ krb5_set_default_in_tkt_etypes(context, etypes)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_default_in_tkt_etypes(context, etypes)
     krb5_context context;
     krb5_enctype **etypes;
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index e8dafaf..0a08e39 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -28,19 +28,19 @@
 #ifndef KRB5_INT_FUNC_PROTO__
 #define KRB5_INT_FUNC_PROTO__
 
-krb5_error_code INTERFACE krb5_tgtname
+krb5_error_code krb5_tgtname
     	PROTOTYPE((krb5_context context,
 	           const krb5_data *,
 	           const krb5_data *,
 	           krb5_principal *));
-krb5_error_code INTERFACE krb5_get_cred_via_tgt
+krb5_error_code krb5_get_cred_via_tgt
     	PROTOTYPE((krb5_context context,
 	           krb5_creds *,
 	           const krb5_flags,
 	           const krb5_cksumtype,
 	           krb5_creds *,
 		   krb5_creds **));
-krb5_error_code INTERFACE krb5_get_cred_via_2tgt
+krb5_error_code krb5_get_cred_via_2tgt
     	PROTOTYPE((krb5_context context,
 	           krb5_creds *,
 	           const krb5_flags,
diff --git a/src/lib/krb5/krb/kdc_rep_dc.c b/src/lib/krb5/krb/kdc_rep_dc.c
index c2cdf12..881a587 100644
--- a/src/lib/krb5/krb/kdc_rep_dc.c
+++ b/src/lib/krb5/krb/kdc_rep_dc.c
@@ -33,7 +33,7 @@
  */
 
 /*ARGSUSED*/
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_kdc_rep_decrypt_proc(context, key, decryptarg, dec_rep)
     krb5_context context;
     const krb5_keyblock * key;
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index b432680..12df2c8 100644
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -31,7 +31,7 @@
 #include "k5-int.h"
 
 /* Create asn.1 encoded KRB-CRED message from the kdc reply. */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_cred(context, dec_rep, etype, key, sender_addr, recv_addr, outbuf)
     krb5_context context;
     krb5_kdc_rep *dec_rep;
diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c
index 4f05e75..1e772e5 100644
--- a/src/lib/krb5/krb/mk_error.c
+++ b/src/lib/krb5/krb/mk_error.c
@@ -34,7 +34,7 @@
 
  returns system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_error(context, dec_err, enc_err)
     krb5_context context;
     const krb5_error *dec_err;
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index 37cf62f..6a80491 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -133,7 +133,7 @@ clean_scratch:
 }
 
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	context;
     krb5_auth_context *	auth_context;
diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index b25e67c..9d5e81e 100644
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -36,7 +36,7 @@
  returns system errors
 */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_rep(context, auth_context, outbuf)
     krb5_context 	  context;
     krb5_auth_context	* auth_context;
diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index 3d86741..a9884a4 100644
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -48,7 +48,7 @@
 
 extern krb5_flags krb5_kdc_default_options;
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
 	      ccache, outbuf)
     krb5_context          context;
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index 528973d..36670ed 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -117,7 +117,7 @@ cleanup_scratch:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	context;
     krb5_auth_context *	auth_context;
diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c
index 2c614d9..b8e9a1b 100644
--- a/src/lib/krb5/krb/pr_to_salt.c
+++ b/src/lib/krb5/krb/pr_to_salt.c
@@ -29,7 +29,7 @@
 /*
  * Convert a krb5_principal into the default salt for that principal.
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt_internal(context, pr, ret, use_realm)
     krb5_context context;
     register krb5_const_principal pr;
@@ -71,7 +71,7 @@ krb5_principal2salt_internal(context, pr, ret, use_realm)
     return 0;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt(context, pr, ret)
     krb5_context context;
     register krb5_const_principal pr;
@@ -80,7 +80,7 @@ krb5_principal2salt(context, pr, ret)
 	return krb5_principal2salt_internal(context, pr, ret, 1);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_principal2salt_norealm(context, pr, ret)
     krb5_context context;
     register krb5_const_principal pr;
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 8beade6..00c17a9a 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -76,7 +76,7 @@ static krb5_error_code find_preauthenticator
  *
  *   Note: This is a first crack at what any preauthentication will need...
  */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_obtain_padata(context, type, client, src_addr, encrypt_key, ret_data)
     krb5_context context;
     int type;			 	/*IN:  Preauth type */
@@ -182,7 +182,7 @@ error_out:
  *   Note: This is a first crack at what any preauthentication will need...
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_verify_padata(context, data,client,src_addr, decrypt_key, req_id, flags)
     krb5_context context;
     krb5_pa_data *data;                 /*IN: padata */
@@ -307,7 +307,7 @@ find_preauthenticator(type, preauth)
  */
 int seeded = 0 ; /* Used by srand below */
 
-krb5_error_code INTERFACE
+krb5_error_code
 get_unixtime_padata(context, client, src_addr, pa_data)
     krb5_context context;
     krb5_principal client;
@@ -344,7 +344,7 @@ get_unixtime_padata(context, client, src_addr, pa_data)
     return(0);
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 verify_unixtime_padata(context, client, src_addr, data)
     krb5_context context;
     krb5_principal client;
@@ -379,7 +379,7 @@ verify_unixtime_padata(context, client, src_addr, data)
 #include "sdcli.h"
 #include "sdconf.c"
 
-krb5_error_code INTERFACE
+krb5_error_code
 verify_securid_padata(client, src_addr, data)
     krb5_principal client;
     krb5_address **src_addr;
@@ -427,7 +427,7 @@ verify_securid_padata(client, src_addr, data)
     }
 }
 #else
-krb5_error_code INTERFACE
+krb5_error_code
 verify_securid_padata(context, client, src_addr, data)
     krb5_context context;
     krb5_principal client;
@@ -451,7 +451,7 @@ static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended
  */
 static char *krb5_SecureId_prompt = "\nEnter Your SecurId Access Code Prepended with Your PIN\n (or a \'#\'if Your PIN is entered on the card keypad): ";
 
-krb5_error_code INTERFACE
+krb5_error_code
 get_securid_padata(context, client,src_addr,pa_data)
     krb5_context context;
     krb5_principal client;
diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c
index 0ada4a2..35c5847 100644
--- a/src/lib/krb5/krb/princ_comp.c
+++ b/src/lib/krb5/krb/princ_comp.c
@@ -27,7 +27,7 @@
 
 #include "k5-int.h"
 
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_realm_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;
@@ -43,7 +43,7 @@ krb5_realm_compare(context, princ1, princ2)
     return TRUE;
 }
 
-krb5_boolean INTERFACE
+krb5_boolean
 krb5_principal_compare(context, princ1, princ2)
     krb5_context context;
     krb5_const_principal princ1;
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index d8212e5..dfe774b 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -33,7 +33,7 @@ extern krb5_deltat krb5_clockskew;
 #define in_clock_skew(date) (labs((date)-currenttime) < krb5_clockskew)
 
 /* Decode the KRB-CRED message, and return creds */
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_cred(context, inbuf, key, creds, sender_addr, recv_addr)
     krb5_context context;
     const krb5_data *inbuf;
diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c
index 0b2d147..bf07539 100644
--- a/src/lib/krb5/krb/rd_error.c
+++ b/src/lib/krb5/krb/rd_error.c
@@ -36,7 +36,7 @@
  *  returns system errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_error(context,  enc_errbuf, dec_error)
     krb5_context context;
     const krb5_data *enc_errbuf;
diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index 3aa6bd2..3c5a416 100644
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -172,7 +172,7 @@ cleanup_privmsg:;
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	context;
     krb5_auth_context * auth_context;
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index cd498a1..a2dfb3c 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -42,7 +42,7 @@
  *  returns system errors, encryption errors, replay errors
  */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_req(context, auth_context, inbuf, server, keytab, 
 	    ap_req_options, ticket)
     krb5_context 	  context;
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index 8555296..0cee98c 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -90,7 +90,7 @@ krb5_rd_req_decrypt_tkt_part(context, req, keytab)
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_req_decoded(context, auth_context, req, server, keytab, 
 		    ap_req_options, ticket)
     krb5_context 	  context;
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index aa5dd35..b7798c1 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -161,7 +161,7 @@ cleanup:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	context;
     krb5_auth_context * auth_context;
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index 02c9e42..b8e384a 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -36,7 +36,7 @@ extern krb5_flags	krb5_kdc_default_options;
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_recvauth(context, auth_context,
 	      /* IN */
 	      fd, appl_version, server, rc_type, flags, keytab,
diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index f093c48..e1bd769 100644
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -163,7 +163,7 @@ cleanup_scratch:
     return retval;
 }
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_send_tgs(context, kdcoptions, timestruct, etypes, sumtype, sname, addrs,
 	      authorization_data, padata, second_ticket, in_cred, rep)
     krb5_context context;
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index e71a749..1e890e8 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -39,7 +39,7 @@ extern krb5_flags	krb5_kdc_default_options;
 
 static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_sendauth(context, auth_context,
 	      /* IN */
 	      fd, appl_version, client, server, ap_req_options, in_data,
diff --git a/src/lib/krb5/krb/srv_rcache.c b/src/lib/krb5/krb/srv_rcache.c
index 5675870..a253431 100644
--- a/src/lib/krb5/krb/srv_rcache.c
+++ b/src/lib/krb5/krb/srv_rcache.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <stdio.h>
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_get_server_rcache(context, piece, rcptr)
     krb5_context context;
     const krb5_data *piece;
diff --git a/src/lib/krb5/krb/tgtname.c b/src/lib/krb5/krb/tgtname.c
index 98e17b4..5db4d98 100644
--- a/src/lib/krb5/krb/tgtname.c
+++ b/src/lib/krb5/krb/tgtname.c
@@ -28,7 +28,7 @@
 
 /* This is an internal-only function, used by krb5_get_cred_from_kdc() */
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_tgtname(context, server, client, tgtprinc)
     krb5_context context;
     const krb5_data *server, *client;
diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c
index 64823c5..d047a8b 100644
--- a/src/lib/krb5/krb/unparse.c
+++ b/src/lib/krb5/krb/unparse.c
@@ -54,7 +54,7 @@
 #define REALM_SEP	'@'
 #define	COMPONENT_SEP	'/'
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_unparse_name_ext(context, principal, name, size)
     krb5_context context;
     krb5_const_principal principal;
diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c
index e083738..3e3945b 100644
--- a/src/lib/krb5/krb/walk_rtree.c
+++ b/src/lib/krb5/krb/walk_rtree.c
@@ -34,7 +34,7 @@
 #define max(x,y) ((x) > (y) ? (x) : (y))
 #endif
 
-krb5_error_code INTERFACE
+krb5_error_code
 krb5_walk_realm_tree(context, client, server, tree, realm_branch_char)
     krb5_context context;
     const krb5_data *client, *server;