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

3 files changed, 59 insertions, 57 deletions

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index e3fa567e0..d9013e347 100644
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* des.h, krb.h: Don't use or define KRB5_DLLIMP, GSS_DLLIMP.
+
 2001-06-27  Ezra Peisach  <epeisach@mit.edu>
 
 	* klog.h: Flush out prototype for klog().
diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h
index b9199cbe8..bc52015a7 100644
--- a/src/include/kerberosIV/des.h
+++ b/src/include/kerberosIV/des.h
@@ -49,8 +49,6 @@
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
-#define KRB5_DLLIMP
-#define GSS_DLLIMP
 #define KRB5_EXPORTVAR
 #endif
 #ifndef FAR
@@ -131,23 +129,23 @@ typedef struct des_ks_struct bit_64;
  * Function Prototypes
  */
 
-KRB5_DLLIMP int KRB5_CALLCONV des_key_sched (C_Block, Key_schedule);
+int KRB5_CALLCONV des_key_sched (C_Block, Key_schedule);
 
-KRB5_DLLIMP int KRB5_CALLCONV
+int KRB5_CALLCONV
 des_pcbc_encrypt (C_Block FAR *in, C_Block FAR *out, long length,
 		  const des_key_schedule schedule, C_Block FAR *ivec,
 		  int enc);
 
-KRB5_DLLIMP unsigned long KRB5_CALLCONV
+unsigned long KRB5_CALLCONV
 des_quad_cksum (const unsigned char FAR *in, unsigned KRB4_32 FAR *out,
 		long length, int out_count, C_Block FAR *seed);
 
-KRB5_DLLIMP int KRB5_CALLCONV des_string_to_key (const char FAR *, C_Block);
+int KRB5_CALLCONV des_string_to_key (const char FAR *, C_Block);
 
 /* new */
 #ifdef KRB5_GENERAL__
 /* Why are we using krb5 types as part of this API?  */
-KRB5_DLLIMP void KRB5_CALLCONV
+void KRB5_CALLCONV
 des_cbc_cksum(const krb5_octet *, krb5_octet *, unsigned long,
 	      const des_key_schedule, const krb5_octet *);
 int des_cbc_encrypt(krb5_octet *, krb5_octet *, unsigned long,
@@ -156,11 +154,11 @@ krb5_error_code des_read_password(des_cblock *, char *, int);
 #endif
 /* The unsigned long pointers are indicative of the desired alignment;
    the values there aren't really treated as long values.  */
-KRB5_DLLIMP int KRB5_CALLCONV des_ecb_encrypt(unsigned long *, unsigned long *,
+int KRB5_CALLCONV des_ecb_encrypt(unsigned long *, unsigned long *,
 					      const des_key_schedule, int);
 void des_fixup_key_parity(des_cblock);
 int des_check_key_parity(des_cblock);
-KRB5_DLLIMP int KRB5_CALLCONV des_new_random_key(des_cblock);
+int KRB5_CALLCONV des_new_random_key(des_cblock);
 void des_init_random_number_generator(des_cblock);
 int des_random_key(des_cblock *);
 int des_is_weak_key(des_cblock);
diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index a241ce857..2da523d10 100644
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -392,19 +392,19 @@ extern struct _krb5_context FAR * krb5__krb4_context;
 struct sockaddr_in;
 
 /* dest_tkt.c */
-KRB5_DLLIMP int KRB5_CALLCONV dest_tkt
+int KRB5_CALLCONV dest_tkt
 	(void);
 /* err_txt.c */
-KRB5_DLLIMP const char FAR * KRB5_CALLCONV krb_get_err_text
+const char FAR * KRB5_CALLCONV krb_get_err_text
 	(int errnum);
 /* g_ad_tkt.c */
 int get_ad_tkt
 	(char *service, char *sinst, char *realm, int lifetime);
 /* g_admhst.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_admhst
+int KRB5_CALLCONV krb_get_admhst
 	(char FAR *host, char FAR *realm, int idx);
 /* g_cred.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_cred
+int KRB5_CALLCONV krb_get_cred
 	(char FAR *service, char FAR *instance, char FAR *realm,
 		   CREDENTIALS FAR *c);
 /* g_in_tkt.c */
@@ -418,82 +418,82 @@ int krb_get_in_tkt_preauth
 		   key_proc_type, decrypt_tkt_type, char *arg,
 		   char *preauth_p, int preauth_len);
 /* g_krbhst.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_krbhst
+int KRB5_CALLCONV krb_get_krbhst
 	(char FAR *host, char FAR *realm, int idx);
 /* g_krbrlm.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_lrealm
+int KRB5_CALLCONV krb_get_lrealm
 	(char FAR *realm, int idx);
 /* g_phost.c */
-KRB5_DLLIMP char FAR * KRB5_CALLCONV krb_get_phost
+char FAR * KRB5_CALLCONV krb_get_phost
 	(char FAR * alias);
 /* get_pw_tkt */
-KRB5_DLLIMP int KRB5_CALLCONV get_pw_tkt 
+int KRB5_CALLCONV get_pw_tkt 
         (char *, char *, char *, char *);
 /* g_pw_in_tkt.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_pw_in_tkt
+int KRB5_CALLCONV krb_get_pw_in_tkt
 	(char FAR *k_user, char FAR *instance, char FAR *realm,
 		   char FAR *service, char FAR *sinstance,
 		   int life, char FAR *password);
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_pw_in_tkt_preauth
+int KRB5_CALLCONV krb_get_pw_in_tkt_preauth
 	(char FAR *k_user, char FAR *instance, char FAR *realm,
 		   char FAR *service, char FAR *sinstance,
 		   int life, char FAR *password);
 /* g_svc_in_tkt.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_svc_in_tkt
+int KRB5_CALLCONV krb_get_svc_in_tkt
 	(char FAR *k_user, char FAR *instance, char FAR *realm,
 		   char FAR *service, char FAR *sinstance,
 		   int life, char FAR *srvtab);
 /* g_tf_fname.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_tf_fullname
+int KRB5_CALLCONV krb_get_tf_fullname
 	(char *ticket_file, char *name, char *inst, char *realm);
 /* g_tf_realm.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_tf_realm
+int KRB5_CALLCONV krb_get_tf_realm
 	(char *ticket_file, char *realm);
 /* g_tkt_svc.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_get_ticket_for_service
+int KRB5_CALLCONV krb_get_ticket_for_service
 	(char FAR *serviceName,
 		   char FAR *buf, unsigned KRB4_32 FAR *buflen,
 		   int checksum, des_cblock, Key_schedule,
 		   char FAR *version, int includeVersion);
 /* in_tkt.c */
-KRB5_DLLIMP int KRB5_CALLCONV in_tkt
+int KRB5_CALLCONV in_tkt
 	(char *name, char *inst);
-KRB5_DLLIMP int KRB5_CALLCONV krb_in_tkt
+int KRB5_CALLCONV krb_in_tkt
         (char *pname, char *pinst, char *realm);
 /* kname_parse.c */
-KRB5_DLLIMP int KRB5_CALLCONV kname_parse
+int KRB5_CALLCONV kname_parse
 	(char FAR *name, char FAR *inst, char FAR *realm,
 		   char FAR *fullname);
-KRB5_DLLIMP int KRB5_CALLCONV k_isname
+int KRB5_CALLCONV k_isname
         (char FAR *);
-KRB5_DLLIMP int KRB5_CALLCONV k_isinst
+int KRB5_CALLCONV k_isinst
         (char FAR *);
-KRB5_DLLIMP int KRB5_CALLCONV k_isrealm
+int KRB5_CALLCONV k_isrealm
         (char FAR *);
 
 
 /* kuserok.c */
-KRB5_DLLIMP int KRB5_CALLCONV kuserok
+int KRB5_CALLCONV kuserok
 	(AUTH_DAT FAR *kdata, char FAR *luser);
 
 /* lifetime.c */
-KRB5_DLLIMP KRB4_32 KRB5_CALLCONV krb_life_to_time
+KRB4_32 KRB5_CALLCONV krb_life_to_time
 	(KRB4_32 start, int life);
-KRB5_DLLIMP int KRB5_CALLCONV krb_time_to_life
+int KRB5_CALLCONV krb_time_to_life
 	(KRB4_32 start, KRB4_32 end);
 
 /* mk_auth.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_check_auth
+int KRB5_CALLCONV krb_check_auth
 	(KTEXT, unsigned KRB4_32 cksum, MSG_DAT FAR *,
 		   C_Block, Key_schedule,
 		   struct sockaddr_in FAR * local_addr,
 		   struct sockaddr_in FAR * foreign_addr);
-KRB5_DLLIMP int KRB5_CALLCONV krb_mk_auth
+int KRB5_CALLCONV krb_mk_auth
 	(long k4_options, KTEXT ticket,
 		   char FAR *service, char FAR *inst, char FAR *realm,
 		   unsigned KRB4_32 checksum, char FAR *version, KTEXT buf);
 /* mk_err.c */
-KRB5_DLLIMP long KRB5_CALLCONV krb_mk_err
+long KRB5_CALLCONV krb_mk_err
 	(u_char FAR *out, KRB4_32 k4_code, char FAR *text);
 /* mk_preauth.c */
 int krb_mk_preauth
@@ -503,19 +503,19 @@ int krb_mk_preauth
 void krb_free_preauth
 	(char * preauth_p, int len);
 /* mk_priv.c */
-KRB5_DLLIMP long KRB5_CALLCONV krb_mk_priv
+long KRB5_CALLCONV krb_mk_priv
 	(u_char FAR *in, u_char FAR *out,
 		   unsigned KRB4_32 length,
 		   Key_schedule, C_Block FAR *,
 		   struct sockaddr_in FAR * sender,
 		   struct sockaddr_in FAR * receiver);
 /* mk_req.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_mk_req
+int KRB5_CALLCONV krb_mk_req
 	(KTEXT authent,
 		   char FAR *service, char FAR *instance, char FAR *realm,
 		   KRB4_32 checksum);
 /* mk_safe.c */
-KRB5_DLLIMP long KRB5_CALLCONV krb_mk_safe
+long KRB5_CALLCONV krb_mk_safe
 	(u_char FAR *in, u_char FAR *out, unsigned KRB4_32 length,
 		   C_Block FAR *,
 		   struct sockaddr_in FAR *sender,
@@ -530,45 +530,45 @@ int krb_net_write
 int pkt_clen
 	(KTEXT);
 /* put_svc_key.c */
-KRB5_DLLIMP int KRB5_CALLCONV put_svc_key
+int KRB5_CALLCONV put_svc_key
 	(char FAR *sfile,
 		   char FAR *name, char FAR *inst, char FAR *realm,
 		   int newvno, char FAR *key);
 /* rd_err.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_rd_err
+int KRB5_CALLCONV krb_rd_err
 	(u_char FAR *in, u_long in_length,
 		   long FAR *k4_code, MSG_DAT FAR *m_data);
 /* rd_priv.c */
-KRB5_DLLIMP long KRB5_CALLCONV krb_rd_priv
+long KRB5_CALLCONV krb_rd_priv
 	(u_char FAR *in,unsigned KRB4_32 in_length,
 		   Key_schedule, C_Block FAR *,
 		   struct sockaddr_in FAR *sender,
 		   struct sockaddr_in FAR *receiver,
 		   MSG_DAT FAR *m_data);
 /* rd_req.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_rd_req
+int KRB5_CALLCONV krb_rd_req
 	(KTEXT, char FAR *service, char FAR *inst,
 		   unsigned KRB4_32 from_addr, AUTH_DAT FAR *,
 		   char FAR *srvtab);
 /* rd_safe.c */
-KRB5_DLLIMP long KRB5_CALLCONV krb_rd_safe
+long KRB5_CALLCONV krb_rd_safe
 	(u_char FAR *in, unsigned KRB4_32 in_length,
 		   C_Block FAR *,
 		   struct sockaddr_in FAR *sender,
 		   struct sockaddr_in FAR *receiver,
 		   MSG_DAT FAR *m_data);
 /* rd_svc_key.c */
-KRB5_DLLIMP int KRB5_CALLCONV read_service_key
+int KRB5_CALLCONV read_service_key
 	(char FAR *service, char FAR *instance, char FAR *realm,
 		   int kvno, char FAR *file, char FAR *key);
-KRB5_DLLIMP int KRB5_CALLCONV get_service_key
+int KRB5_CALLCONV get_service_key
 	(char FAR *service, char FAR *instance, char FAR *realm,
 		   int FAR *kvno, char FAR *file, char FAR *key);
 /* realmofhost.c */
-KRB5_DLLIMP char FAR * KRB5_CALLCONV krb_realmofhost
+char FAR * KRB5_CALLCONV krb_realmofhost
 	(char FAR *host);
 /* recvauth.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_recvauth
+int KRB5_CALLCONV krb_recvauth
 	(long k4_options, int fd, KTEXT ticket,
 		   char FAR *service, char FAR *instance,
 		   struct sockaddr_in FAR *foreign_addr,
@@ -576,7 +576,7 @@ KRB5_DLLIMP int KRB5_CALLCONV krb_recvauth
 		   AUTH_DAT FAR *kdata, char FAR *srvtab,
 		   Key_schedule schedule, char FAR *version);
 /* sendauth.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_sendauth
+int KRB5_CALLCONV krb_sendauth
         (long k4_options, int fd, KTEXT ticket,
 	 char FAR *service, char FAR *inst, char FAR *realm,
 	 unsigned KRB4_32 checksum, MSG_DAT *msg_data,
@@ -585,7 +585,7 @@ KRB5_DLLIMP int KRB5_CALLCONV krb_sendauth
 	 char FAR *version);
 
 /* save_creds.c */
-KRB5_DLLIMP int KRB5_CALLCONV krb_save_credentials
+int KRB5_CALLCONV krb_save_credentials
 	(char FAR *service, char FAR *instance, char FAR *realm,
 		   C_Block session, int lifetime, int kvno,
 		   KTEXT ticket, long issue_date);
@@ -600,18 +600,18 @@ void krb_set_tkt_string
 	(char *);
 
 /* tf_util.c */
-KRB5_DLLIMP int KRB5_CALLCONV tf_init (char *tf_name, int rw);
+int KRB5_CALLCONV tf_init (char *tf_name, int rw);
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_pname (char *p);
+int KRB5_CALLCONV tf_get_pname (char *p);
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_pinst (char *p);
+int KRB5_CALLCONV tf_get_pinst (char *p);
 
-KRB5_DLLIMP int KRB5_CALLCONV tf_get_cred (CREDENTIALS *c);
+int KRB5_CALLCONV tf_get_cred (CREDENTIALS *c);
 
-KRB5_DLLIMP void KRB5_CALLCONV tf_close (void);
+void KRB5_CALLCONV tf_close (void);
 
 /* unix_time.c */
-KRB5_DLLIMP unsigned KRB4_32 KRB5_CALLCONV unix_time_gmt_unixsec 
+unsigned KRB4_32 KRB5_CALLCONV unix_time_gmt_unixsec 
         (unsigned KRB4_32 *);
 
 /*
@@ -659,8 +659,8 @@ extern int krb_set_key_krb5(krb5_context ctx, krb5_keyblock *key);
 #ifdef _WINDOWS
 HINSTANCE get_lib_instance(void);
 unsigned int krb_get_notification_message(void);
-KRB5_DLLIMP char FAR * KRB5_CALLCONV krb_get_default_user(void);
-KRB5_DLLIMP int KRB5_CALLCONV krb_set_default_user(char *);
+char FAR * KRB5_CALLCONV krb_get_default_user(void);
+int KRB5_CALLCONV krb_set_default_user(char *);
 unsigned KRB4_32 win_time_gmt_unixsec(unsigned KRB4_32 *);
 long win_time_get_epoch(void);
 #endif