Danilo says we can get rid of the DLLIMP stuff now

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

37 files changed, 66 insertions, 55 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 7f4f4a5b5..3073ae40c 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* dest_tkt.c, err_tkt.c, g_admhst.c, g_cred.c, g_krbhst.c,
+	g_krbrlm.c, g_phost.c, g_pw_in_tkt.c, g_pw_tkt.c, g_svc_in_tkt.c,
+	g_tf_fname.c, g_tf_realm.c, g_tkt_svc.c, in_tkt.c, kname_parse.c,
+	kuserok.c, lifetime.c, memcache.c, mk_auth.c, mk_err.c, mk_priv.c,
+	mk_req.c, mk_safe.c, put_svc_key.c, rd_err.c, rd_priv.c, rd_req.c,
+	rd_safe.c, rd_svc_key.c, realmofhost.c, recvauth.c, save_creds.c,
+	sendauth.c, tf_util.c, unix_time.c, win_store.c: Don't use
+	KRB5_DLLIMP.
+
 2001-09-28  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (LOCALINCLUDES): Renamed from DEFINES.  Add
diff --git a/src/lib/krb4/dest_tkt.c b/src/lib/krb4/dest_tkt.c
index 78878228a..fd9ae68ac 100644
--- a/src/lib/krb4/dest_tkt.c
+++ b/src/lib/krb4/dest_tkt.c
@@ -64,7 +64,7 @@
  * The ticket file (TKT_FILE) is defined in "krb.h".
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 dest_tkt()
 {
     char *file = TKT_FILE;
diff --git a/src/lib/krb4/err_txt.c b/src/lib/krb4/err_txt.c
index 8cf009287..46272c5ec 100644
--- a/src/lib/krb4/err_txt.c
+++ b/src/lib/krb4/err_txt.c
@@ -283,7 +283,7 @@ const
 };
 
 
-KRB5_DLLIMP const char FAR * KRB5_CALLCONV
+const char FAR * KRB5_CALLCONV
 krb_get_err_text (code)
     int code;
 {
diff --git a/src/lib/krb4/g_admhst.c b/src/lib/krb4/g_admhst.c
index abaf48136..1222fb854 100644
--- a/src/lib/krb4/g_admhst.c
+++ b/src/lib/krb4/g_admhst.c
@@ -35,7 +35,7 @@
  * provided by a nameserver.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_admhst(h, r, n)
     char FAR *h;
     char FAR *r;
diff --git a/src/lib/krb4/g_cred.c b/src/lib/krb4/g_cred.c
index c05fb9ba5..4660fd42a 100644
--- a/src/lib/krb4/g_cred.c
+++ b/src/lib/krb4/g_cred.c
@@ -22,7 +22,7 @@
  * On failure it returns a Kerberos error code.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_cred(service,instance,realm,c)
     char FAR *service;		/* Service name */
     char FAR *instance;		/* Instance */
diff --git a/src/lib/krb4/g_krbhst.c b/src/lib/krb4/g_krbhst.c
index 65bf57fa3..fb7e7e428 100644
--- a/src/lib/krb4/g_krbhst.c
+++ b/src/lib/krb4/g_krbhst.c
@@ -64,7 +64,7 @@ get_krbhst_default(h, r, n)
         return(KFAILURE);
 }
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_krbhst(h,r,n)
     char FAR *h;
     char FAR *r;
diff --git a/src/lib/krb4/g_krbrlm.c b/src/lib/krb4/g_krbrlm.c
index d31b59a02..608e1b884 100644
--- a/src/lib/krb4/g_krbrlm.c
+++ b/src/lib/krb4/g_krbrlm.c
@@ -29,7 +29,7 @@
  * krb_get_krbhst().  This will also look in KRB_FB_CONF is
  * ATHENA_CONF_FALLBACK is defined.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_lrealm(r,n)
     char *r;
     int n;
diff --git a/src/lib/krb4/g_phost.c b/src/lib/krb4/g_phost.c
index 15d027974..02643a832 100644
--- a/src/lib/krb4/g_phost.c
+++ b/src/lib/krb4/g_phost.c
@@ -48,7 +48,7 @@
  * to the original "alias" argument is returned.
  */
 
-KRB5_DLLIMP char FAR * KRB5_CALLCONV
+char FAR * KRB5_CALLCONV
 krb_get_phost(alias)
     char FAR *alias;
 {
diff --git a/src/lib/krb4/g_pw_in_tkt.c b/src/lib/krb4/g_pw_in_tkt.c
index b81a4e270..ad6ad867a 100644
--- a/src/lib/krb4/g_pw_in_tkt.c
+++ b/src/lib/krb4/g_pw_in_tkt.c
@@ -93,7 +93,7 @@ passwd_to_key(user,instance,realm,passwd,key)
  * The result of the call to krb_get_in_tkt() is returned.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
     char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
     int life;
@@ -132,7 +132,7 @@ static int stub_key(user,instance,realm,passwd,key)
    return 0;
 }
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_pw_in_tkt_preauth(user,instance,realm,service,sinstance,life,password)
     char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
     int life;
diff --git a/src/lib/krb4/g_pw_tkt.c b/src/lib/krb4/g_pw_tkt.c
index b6d00769a..f074fbc6c 100644
--- a/src/lib/krb4/g_pw_tkt.c
+++ b/src/lib/krb4/g_pw_tkt.c
@@ -41,7 +41,7 @@
  * the password-changing server will be in the user's ticket file.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 get_pw_tkt(user,instance,realm,cpw)
     char *user;
     char *instance;
diff --git a/src/lib/krb4/g_svc_in_tkt.c b/src/lib/krb4/g_svc_in_tkt.c
index 603a9037c..1b057611e 100644
--- a/src/lib/krb4/g_svc_in_tkt.c
+++ b/src/lib/krb4/g_svc_in_tkt.c
@@ -61,7 +61,7 @@ static int srvtab_to_key(user, instance, realm, srvtab, key)
  * It returns the return value of the krb_get_in_tkt() call.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_svc_in_tkt(user, instance, realm, service, sinstance, life, srvtab)
     char FAR *user, FAR *instance, FAR *realm, FAR *service, FAR *sinstance;
     int life;
diff --git a/src/lib/krb4/g_tf_fname.c b/src/lib/krb4/g_tf_fname.c
index 5235ff3a2..36a2f8645 100644
--- a/src/lib/krb4/g_tf_fname.c
+++ b/src/lib/krb4/g_tf_fname.c
@@ -26,7 +26,7 @@
  * krb_get_in_tkt().
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_tf_fullname(ticket_file, name, instance, realm)
   char *ticket_file;
   char *name;
diff --git a/src/lib/krb4/g_tf_realm.c b/src/lib/krb4/g_tf_realm.c
index 55fe79ef0..92e109996 100644
--- a/src/lib/krb4/g_tf_realm.c
+++ b/src/lib/krb4/g_tf_realm.c
@@ -21,7 +21,7 @@
  * 
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_tf_realm(ticket_file, realm)
   char *ticket_file;
   char *realm;
diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c
index 5460c5943..329cb9493 100644
--- a/src/lib/krb4/g_tkt_svc.c
+++ b/src/lib/krb4/g_tkt_svc.c
@@ -103,7 +103,7 @@ CredIsExpired( cr )
  * to get a new TGT.
  */ 
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_ticket_for_service (serviceName, buf, buflen, checksum, sessionKey,
 		schedule, version, includeVersion)
 	char FAR *serviceName;
diff --git a/src/lib/krb4/in_tkt.c b/src/lib/krb4/in_tkt.c
index 3b53ebe85..c70c6c55b 100644
--- a/src/lib/krb4/in_tkt.c
+++ b/src/lib/krb4/in_tkt.c
@@ -63,7 +63,7 @@ extern int krb_debug;
 #define O_SYNC 0
 #endif
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 in_tkt(pname,pinst)
     char *pname;
     char *pinst;
@@ -199,7 +199,7 @@ in_tkt(pname,pinst)
 #endif /* TKT_SHMEM */
 }
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_in_tkt(pname, pinst, prealm)
     char *pname;
     char *pinst;
diff --git a/src/lib/krb4/kname_parse.c b/src/lib/krb4/kname_parse.c
index 18da8aec5..b5157effa 100644
--- a/src/lib/krb4/kname_parse.c
+++ b/src/lib/krb4/kname_parse.c
@@ -71,7 +71,7 @@
  * of name, instance, and realm.  FIXME-gnu:  Does anyone use it this way?
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 kname_parse(np, ip, rp, fullname)
     char FAR *np;
     char FAR *ip;
@@ -174,7 +174,7 @@ kname_parse(np, ip, rp, fullname)
  * Kerberos name; returns 0 if it's not.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 k_isname(s)
     char FAR *s;
 {
@@ -213,7 +213,7 @@ k_isname(s)
  * We now allow periods in instance names -- they are unambiguous.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 k_isinst(s)
     char FAR *s;
 {
@@ -244,7 +244,7 @@ k_isinst(s)
  * Kerberos realm; returns 0 if it's not.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 k_isrealm(s)
     char FAR *s;
 {
diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c
index 40a3bd86d..2ac2998c8 100644
--- a/src/lib/krb4/kuserok.c
+++ b/src/lib/krb4/kuserok.c
@@ -95,7 +95,7 @@ parmtable kparm[] = {
 #define KPARMS kparm,PARMCOUNT(kparm)
 #endif
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 kuserok(kdata, luser)
     AUTH_DAT	FAR *kdata;
     char	FAR *luser;
diff --git a/src/lib/krb4/lifetime.c b/src/lib/krb4/lifetime.c
index e02f58006..b43ed4523 100644
--- a/src/lib/krb4/lifetime.c
+++ b/src/lib/krb4/lifetime.c
@@ -97,7 +97,7 @@ static const KRB4_32 lifetimes[NLIFETIMES] = {
  * Given a start date and a lifetime byte, compute the expiration
  * date.
  */
-KRB5_DLLIMP KRB4_32 KRB5_CALLCONV
+KRB4_32 KRB5_CALLCONV
 krb_life_to_time(KRB4_32 start, int life)
 {
     if (life < 0 || life > 255)	/* possibly sign botch in caller */
@@ -120,7 +120,7 @@ krb_life_to_time(KRB4_32 start, int life)
  * Round up, since we can adjust the start date backwards if we are
  * issuing the ticket to cause it to expire at the correct time.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_time_to_life(KRB4_32 start, KRB4_32 end)
 {
     KRB4_32 dt;
diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c
index 9d7950497..5ca7c076f 100644
--- a/src/lib/krb4/memcache.c
+++ b/src/lib/krb4/memcache.c
@@ -259,7 +259,7 @@ static char curr_auth_uinst [INST_SZ];
     via ResEdit.
 
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 in_tkt(pname,pinst)
     char *pname;
     char *pinst;
@@ -279,7 +279,7 @@ in_tkt(pname,pinst)
 	
 }
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_in_tkt(pname, pinst, prealm)
     char *pname;
     char *pinst;
@@ -295,7 +295,7 @@ krb_in_tkt(pname, pinst, prealm)
  * failure.
  *
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 dest_tkt()
 {
  	/* 	
@@ -354,7 +354,7 @@ int	dest_all_tkts()
 
 
 /* krb_get_tf_realm -- return the realm of the current ticket file. */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_tf_realm (tktfile, lrealm)
 	char *tktfile;
 	char *lrealm;		/* Result stored through here */
@@ -366,7 +366,7 @@ krb_get_tf_realm (tktfile, lrealm)
 
 /* krb_get_tf_fullname -- return name, instance and realm of the
 principal in the current ticket file. */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_tf_fullname (tktfile, name, instance, realm)
   char *tktfile;
   char *name;
@@ -417,7 +417,7 @@ krb_get_tf_fullname (tktfile, name, instance, realm)
  * information from the file.  If successful, it returns KSUCCESS.
  * On failure it returns a Kerberos error code.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_get_cred (service, instance, realm, c)
 	char *service;		/* Service name */
 	char *instance;		/* Instance */
@@ -457,7 +457,7 @@ krb_get_cred (service, instance, realm, c)
  * Returns KSUCCESS if all goes well, otherwise KFAILURE.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_save_credentials(sname, sinst, srealm, session, 
 			lifetime, kvno, ticket, issue_date)
 
diff --git a/src/lib/krb4/mk_auth.c b/src/lib/krb4/mk_auth.c
index 335324cdc..a6c1d9f82 100644
--- a/src/lib/krb4/mk_auth.c
+++ b/src/lib/krb4/mk_auth.c
@@ -114,7 +114,7 @@
 /*
  * Build a "sendauth" packet compatible with Unix sendauth/recvauth.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_mk_auth(options, ticket, service, inst, realm, checksum, version, buf)
      long options;		/* bit-pattern of options */
      KTEXT ticket;		/* where to put ticket (return); or
@@ -209,7 +209,7 @@ krb_mk_auth(options, ticket, service, inst, realm, checksum, version, buf)
  * and "schedule" returns the key schedule for that decryption.  The
  * the local and server addresses are given in "laddr" and "faddr".
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_check_auth (buf, checksum, msg_data, session, schedule, laddr, faddr)
      KTEXT buf;			/* The response we read from app server */
      unsigned KRB4_32 checksum; /* checksum we included in request */
diff --git a/src/lib/krb4/mk_err.c b/src/lib/krb4/mk_err.c
index 721149ec2..21546607f 100644
--- a/src/lib/krb4/mk_err.c
+++ b/src/lib/krb4/mk_err.c
@@ -48,7 +48,7 @@
  * string		e_string		given error text
  */
 
-KRB5_DLLIMP long KRB5_CALLCONV
+long KRB5_CALLCONV
 krb_mk_err(p, e, e_string)
     u_char FAR *p;		/* Where to build error packet */
     KRB4_32 e;			/* Error code */
diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c
index 1e168adce..17bd64d6c 100644
--- a/src/lib/krb4/mk_priv.c
+++ b/src/lib/krb4/mk_priv.c
@@ -93,7 +93,7 @@ extern int krb_debug;
 #endif
  */
 
-KRB5_DLLIMP long KRB5_CALLCONV
+long KRB5_CALLCONV
 krb_mk_priv(in, out, length, schedule, key, sender, receiver)
     u_char FAR *in;		/* application data */
     u_char FAR *out;		/* put msg here, leave room for
diff --git a/src/lib/krb4/mk_req.c b/src/lib/krb4/mk_req.c
index 4f783fb99..fa301ffba 100644
--- a/src/lib/krb4/mk_req.c
+++ b/src/lib/krb4/mk_req.c
@@ -84,7 +84,7 @@ static int lifetime = 255;		/* Default based on the TGT */
  *                  all rounded up to multiple of 8.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_mk_req(authent, service, instance, realm, checksum)
     register	KTEXT authent;	/* Place to build the authenticator */
     char	FAR *service;	/* Name of the service */
diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c
index 93cd1ead6..1cc5fc21f 100644
--- a/src/lib/krb4/mk_safe.c
+++ b/src/lib/krb4/mk_safe.c
@@ -75,7 +75,7 @@ extern int krb_debug;
  *						above using "key"
  */
 
-KRB5_DLLIMP long KRB5_CALLCONV
+long KRB5_CALLCONV
 krb_mk_safe(in, out, length, key, sender, receiver)
     u_char *in;			/* application data */
     u_char *out;		/*
diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c
index a9264545f..787901422 100644
--- a/src/lib/krb4/put_svc_key.c
+++ b/src/lib/krb4/put_svc_key.c
@@ -38,7 +38,7 @@
    The key (exact match) must already be in the file;
    version numbers are not checked.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 put_svc_key(sfile,name,inst,realm,newvno,key)
 	char FAR *sfile;
 	char FAR *name;
diff --git a/src/lib/krb4/rd_err.c b/src/lib/krb4/rd_err.c
index 6ba9a646c..90964df95 100644
--- a/src/lib/krb4/rd_err.c
+++ b/src/lib/krb4/rd_err.c
@@ -46,7 +46,7 @@
  * The AUTH_MSG_APPL_ERR message format can be found in mk_err.c
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_rd_err(in, in_length, code, m_data)
     u_char FAR *in;                 /* pointer to the msg received */
     u_long in_length;           /* of in msg */
diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c
index 462d91574..5a99be88d 100644
--- a/src/lib/krb4/rd_priv.c
+++ b/src/lib/krb4/rd_priv.c
@@ -79,7 +79,7 @@ int private_msg_ver = KRB_PROT_VERSION;
  * information, MSG_DAT, is defined in "krb.h".
  */
 
-KRB5_DLLIMP long KRB5_CALLCONV
+long KRB5_CALLCONV
 krb_rd_priv(in, in_length, schedule, key, sender, receiver, m_data)
     u_char *in;			/* pointer to the msg received */
     unsigned KRB4_32 in_length; /* length of "in" msg */
diff --git a/src/lib/krb4/rd_req.c b/src/lib/krb4/rd_req.c
index e8119b85c..2c8a24726 100644
--- a/src/lib/krb4/rd_req.c
+++ b/src/lib/krb4/rd_req.c
@@ -162,7 +162,7 @@ krb_clear_key_krb5(ctx)
  * Mutual authentication is not implemented.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_rd_req(authent, service, instance, from_addr, ad, fn)
     register KTEXT authent;	/* The received message */
     char FAR *service;		/* Service name */
diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c
index 23578a220..b0e955a11 100644
--- a/src/lib/krb4/rd_safe.c
+++ b/src/lib/krb4/rd_safe.c
@@ -62,7 +62,7 @@ extern int krb_debug;
  * information, MSG_DAT, is defined in "krb.h".
  */
 
-KRB5_DLLIMP long KRB5_CALLCONV
+long KRB5_CALLCONV
 krb_rd_safe(in,in_length,key,sender,receiver,m_data)
     u_char FAR *in;			/* pointer to the msg received */
     unsigned KRB4_32 in_length;		/* length of "in" msg */
diff --git a/src/lib/krb4/rd_svc_key.c b/src/lib/krb4/rd_svc_key.c
index f59aac6b7..b6188399b 100644
--- a/src/lib/krb4/rd_svc_key.c
+++ b/src/lib/krb4/rd_svc_key.c
@@ -210,7 +210,7 @@ errout:
 #endif
 
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 read_service_key(service,instance,realm,kvno,file,key)
     char FAR *service;		/* Service Name */
     char FAR *instance;		/* Instance name or "*" */
@@ -261,7 +261,7 @@ errout:
 /* kvno is passed by reference, so that if it is zero, and we find a match,
    the match gets written back into *kvno so the caller can find it.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 get_service_key(service,instance,realm,kvno,file,key)
     char FAR *service;              /* Service Name */
     char FAR *instance;             /* Instance name or "*" */
diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c
index b3499de42..e419b56ea 100644
--- a/src/lib/krb4/realmofhost.c
+++ b/src/lib/krb4/realmofhost.c
@@ -43,7 +43,7 @@ extern char *malloc();
 
 static char ret_realm[REALM_SZ+1];
 
-KRB5_DLLIMP char FAR * KRB5_CALLCONV
+char FAR * KRB5_CALLCONV
 krb_realmofhost(host)
     char FAR *host;
 {
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index d78d00eaf..41620f53d 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -120,7 +120,7 @@ extern int errno;
 #define	max(a,b) (((a) > (b)) ? (a) : (b))
 #endif /* max */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_recvauth(options, fd, ticket, service, instance, faddr, laddr, kdata,
 	     filename, schedule, version)
     long options;			 /* bit-pattern of options */
diff --git a/src/lib/krb4/save_creds.c b/src/lib/krb4/save_creds.c
index 4f2a0e6cc..fbd706bcf 100644
--- a/src/lib/krb4/save_creds.c
+++ b/src/lib/krb4/save_creds.c
@@ -29,7 +29,7 @@
  * to avoid namespace pollution.
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_save_credentials(service, instance, realm, session, lifetime, kvno,
                  ticket, issue_date)
     char FAR *service;		/* Service name */
diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c
index 9baf27def..c44151cfd 100644
--- a/src/lib/krb4/sendauth.c
+++ b/src/lib/krb4/sendauth.c
@@ -179,7 +179,7 @@ krb_net_rd_sendauth (fd, reply, raw_len)
  * end-user application server, sucks a response out of the socket, 
  * and decodes it to verify mutual authentication.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_sendauth(options, fd, ticket, service, inst, realm, checksum,
 	     msg_data, cred, schedule, laddr, faddr, version)
      long options;		/* bit-pattern of options */
diff --git a/src/lib/krb4/tf_util.c b/src/lib/krb4/tf_util.c
index bda4d4142..333961b4e 100644
--- a/src/lib/krb4/tf_util.c
+++ b/src/lib/krb4/tf_util.c
@@ -176,7 +176,7 @@ static int tf_gets PROTOTYPE((char *, int)), tf_read PROTOTYPE((char *, int));
  * TKT_FIL_LCK  - couldn't lock the file, even after a retry
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_init(tf_name, rw)
+int KRB5_CALLCONV tf_init(tf_name, rw)
     char   *tf_name;
     int rw;
 {
@@ -466,7 +466,7 @@ KRB5_DLLIMP int KRB5_CALLCONV tf_init(tf_name, rw)
  * was longer than ANAME_SZ, TKT_FIL_FMT is returned. 
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_pname(p)
+int KRB5_CALLCONV tf_get_pname(p)
     char   *p;
 {
     if (fd < 0) {
@@ -489,7 +489,7 @@ KRB5_DLLIMP int KRB5_CALLCONV tf_get_pname(p)
  * instance may be null. 
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_pinst(inst)
+int KRB5_CALLCONV tf_get_pinst(inst)
     char   *inst;
 {
     if (fd < 0) {
@@ -513,7 +513,7 @@ KRB5_DLLIMP int KRB5_CALLCONV tf_get_pinst(inst)
  * EOF          - end of file encountered
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_cred(c)
+int KRB5_CALLCONV tf_get_cred(c)
     CREDENTIALS *c;
 {
     KTEXT   ticket = &c->ticket_st;	/* pointer to ticket */
@@ -580,7 +580,7 @@ KRB5_DLLIMP int KRB5_CALLCONV tf_get_cred(c)
  * The return value is not defined.
  */
 
-KRB5_DLLIMP void KRB5_CALLCONV tf_close()
+void KRB5_CALLCONV tf_close()
 {
     if (!(fd < 0)) {
 #ifdef TKT_SHMEM
diff --git a/src/lib/krb4/unix_time.c b/src/lib/krb4/unix_time.c
index b47793ac9..411ee38d6 100644
--- a/src/lib/krb4/unix_time.c
+++ b/src/lib/krb4/unix_time.c
@@ -13,7 +13,7 @@
 /* Time handling.  Translate Unix time calls into Kerberos cnternal 
    procedure calls.  See ../../include/cc-unix.h.  */
 
-KRB5_DLLIMP unsigned KRB4_32 KRB5_CALLCONV
+unsigned KRB4_32 KRB5_CALLCONV
 unix_time_gmt_unixsec (usecptr)
 	unsigned KRB4_32	*usecptr;
 {
diff --git a/src/lib/krb4/win_store.c b/src/lib/krb4/win_store.c
index 28d11bd85..39841fcb6 100644
--- a/src/lib/krb4/win_store.c
+++ b/src/lib/krb4/win_store.c
@@ -119,7 +119,7 @@ krb__get_realmsfile()
  * the [DEFAULTS] section of the "kerberos.ini" file located in the
  * Windows directory.
  */
-KRB5_DLLIMP char FAR * KRB5_CALLCONV
+char FAR * KRB5_CALLCONV
 krb_get_default_user()
 {
 	static char username[ANAME_SZ];
@@ -134,7 +134,7 @@ krb_get_default_user()
 /*
  * Sets the default user name stored in the "kerberos.ini" file.
  */
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 krb_set_default_user(username)
 	char *username;
 {