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

13 files changed, 136 insertions, 124 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 9bb78bac7..38f4df1c6 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* gssapi.hin, gssapi_generic.c, gssapi_generic.h: Don't use
+	GSS_DLLIMP.
+
 2001-06-25  Tom Yu  <tlyu@mit.edu>
 
 	* gssapi.hin, gssapi_generic.h, gssapi_generic.c:
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index c5f2416ba..8fe48afcd 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -39,8 +39,6 @@
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
-#define KRB5_DLLIMP
-#define GSS_DLLIMP
 #define KRB5_EXPORTVAR
 #endif
 #ifndef FAR
@@ -342,7 +340,7 @@ extern "C" {
  * GSS_C_NT_USER_NAME should be initialized to point
  * to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_USER_NAME;
+extern gss_OID GSS_C_NT_USER_NAME;
 
 /*
  * The implementation must reserve static storage for a
@@ -354,7 +352,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_USER_NAME;
  * The constant GSS_C_NT_MACHINE_UID_NAME should be
  * initialized to point to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_MACHINE_UID_NAME;
+extern gss_OID GSS_C_NT_MACHINE_UID_NAME;
 
 /*
  * The implementation must reserve static storage for a
@@ -366,7 +364,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_MACHINE_UID_NAME;
  * The constant GSS_C_NT_STRING_UID_NAME should be
  * initialized to point to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_STRING_UID_NAME;
+extern gss_OID GSS_C_NT_STRING_UID_NAME;
 
 /*
  * The implementation must reserve static storage for a
@@ -385,7 +383,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_STRING_UID_NAME;
  * parameter, but should not be emitted by GSS-API
  * implementations
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_HOSTBASED_SERVICE_X;
+extern gss_OID GSS_C_NT_HOSTBASED_SERVICE_X;
 
 /*
  * The implementation must reserve static storage for a
@@ -398,7 +396,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_HOSTBASED_SERVICE_X;
  * GSS_C_NT_HOSTBASED_SERVICE should be initialized
  * to point to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_HOSTBASED_SERVICE;
+extern gss_OID GSS_C_NT_HOSTBASED_SERVICE;
 
 /*
  * The implementation must reserve static storage for a
@@ -410,7 +408,7 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_HOSTBASED_SERVICE;
  * and GSS_C_NT_ANONYMOUS should be initialized to point
  * to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_ANONYMOUS;
+extern gss_OID GSS_C_NT_ANONYMOUS;
 
 
 /*
@@ -423,11 +421,11 @@ GSS_DLLIMP extern gss_OID GSS_C_NT_ANONYMOUS;
  * GSS_C_NT_EXPORT_NAME should be initialized to point
  * to that gss_OID_desc.
  */
-GSS_DLLIMP extern gss_OID GSS_C_NT_EXPORT_NAME;
+extern gss_OID GSS_C_NT_EXPORT_NAME;
 
 /* Function Prototypes */
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_acquire_cred
+OM_uint32 KRB5_CALLCONV gss_acquire_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t,			/* desired_name */
             OM_uint32,			/* time_req */
@@ -438,12 +436,12 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32 FAR *		/* time_rec */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_cred
+OM_uint32 KRB5_CALLCONV gss_release_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t FAR *		/* cred_handle */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_init_sec_context
+OM_uint32 KRB5_CALLCONV gss_init_sec_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t,		/* claimant_cred_handle */
             gss_ctx_id_t FAR *,		/* context_handle */
@@ -459,7 +457,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32 FAR *		/* time_rec */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_accept_sec_context
+OM_uint32 KRB5_CALLCONV gss_accept_sec_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_ctx_id_t FAR *,		/* context_handle */
             gss_cred_id_t,		/* acceptor_cred_handle */
@@ -473,26 +471,26 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t FAR *		/* delegated_cred_handle */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_process_context_token
+OM_uint32 KRB5_CALLCONV gss_process_context_token
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             gss_buffer_t		/* token_buffer */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_delete_sec_context
+OM_uint32 KRB5_CALLCONV gss_delete_sec_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_ctx_id_t FAR *,		/* context_handle */
             gss_buffer_t		/* output_token */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_context_time
+OM_uint32 KRB5_CALLCONV gss_context_time
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_ctx_id_t,		/* context_handle */
             OM_uint32 FAR *		/* time_rec */
            ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_get_mic
+OM_uint32 KRB5_CALLCONV gss_get_mic
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
@@ -501,7 +499,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify_mic
+OM_uint32 KRB5_CALLCONV gss_verify_mic
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
@@ -510,7 +508,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap
+OM_uint32 KRB5_CALLCONV gss_wrap
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
@@ -521,7 +519,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_unwrap
+OM_uint32 KRB5_CALLCONV gss_unwrap
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* input_message_buffer */
@@ -530,7 +528,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_qop_t FAR *		/* qop_state */
 	   ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_display_status
+OM_uint32 KRB5_CALLCONV gss_display_status
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32,			/* status_value */
             int,			/* status_type */
@@ -539,48 +537,48 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_buffer_t		/* status_string */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_indicate_mechs
+OM_uint32 KRB5_CALLCONV gss_indicate_mechs
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_OID_set FAR *		/* mech_set */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_compare_name
+OM_uint32 KRB5_CALLCONV gss_compare_name
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t,			/* name1 */
             gss_name_t,			/* name2 */
             int FAR *			/* name_equal */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_display_name
+OM_uint32 KRB5_CALLCONV gss_display_name
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t,			/* input_name */
             gss_buffer_t,		/* output_name_buffer */
             gss_OID FAR *		/* output_name_type */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_name
+OM_uint32 KRB5_CALLCONV gss_import_name
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_buffer_t,		/* input_name_buffer */
             gss_OID,			/* input_name_type(used to be const) */
             gss_name_t FAR *		/* output_name */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_name
+OM_uint32 KRB5_CALLCONV gss_release_name
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t FAR *		/* input_name */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_buffer
+OM_uint32 KRB5_CALLCONV gss_release_buffer
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_buffer_t		/* buffer */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid_set
+OM_uint32 KRB5_CALLCONV gss_release_oid_set
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_OID_set FAR * 		/* set */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_cred
+OM_uint32 KRB5_CALLCONV gss_inquire_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t,		/* cred_handle */
             gss_name_t FAR *,		/* name */
@@ -590,7 +588,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
            ));
 
 /* Last argument new for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_context
+OM_uint32 KRB5_CALLCONV gss_inquire_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_name_t FAR *,		/* src_name */
@@ -603,7 +601,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
+OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
@@ -613,7 +611,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_name_object
+OM_uint32 KRB5_CALLCONV gss_import_name_object
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    void FAR *,			/* input_name */
 	    gss_OID,			/* input_name_type */
@@ -621,7 +619,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_name_object
+OM_uint32 KRB5_CALLCONV gss_export_name_object
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
@@ -629,7 +627,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_add_cred
+OM_uint32 KRB5_CALLCONV gss_add_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_cred_id_t,		/* input_cred_handle */
 	    gss_name_t,			/* desired_name */
@@ -644,7 +642,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech
+OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech
 PROTOTYPE( (OM_uint32  FAR *,		/* minor_status */
 	    gss_cred_id_t,		/* cred_handle */
 	    gss_OID,			/* mech_type */
@@ -655,40 +653,40 @@ PROTOTYPE( (OM_uint32  FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_sec_context
+OM_uint32 KRB5_CALLCONV gss_export_sec_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t FAR *,		/* context_handle */
 	    gss_buffer_t		/* interprocess_token */
 	    ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_sec_context
+OM_uint32 KRB5_CALLCONV gss_import_sec_context
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_buffer_t,		/* interprocess_token */
 	    gss_ctx_id_t FAR *		/* context_handle */
 	    ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid
+OM_uint32 KRB5_CALLCONV gss_release_oid
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID FAR *		/* oid */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
+OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID_set FAR *		/* oid_set */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_add_oid_set_member
+OM_uint32 KRB5_CALLCONV gss_add_oid_set_member
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* member_oid */
 	    gss_OID_set FAR *		/* oid_set */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
+OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* member */
 	    gss_OID_set,		/* set */
@@ -696,21 +694,21 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_str_to_oid
+OM_uint32 KRB5_CALLCONV gss_str_to_oid
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_buffer_t,		/* oid_str */
 	    gss_OID FAR *		/* oid */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_oid_to_str
+OM_uint32 KRB5_CALLCONV gss_oid_to_str
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* oid */
 	    gss_buffer_t		/* oid_str */
 	   ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
+OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set FAR *		/* name_types */
@@ -723,7 +721,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
  * entrypoints (as opposed to #defines) should be provided, to allow GSSAPI
  * V1 applications to link against GSSAPI V2 implementations.
  */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_sign
+OM_uint32 KRB5_CALLCONV gss_sign
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* qop_req */
@@ -731,7 +729,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_buffer_t      	/* message_token */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify
+OM_uint32 KRB5_CALLCONV gss_verify
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* message_buffer */
@@ -739,7 +737,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             int FAR *           /* qop_state */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_seal
+OM_uint32 KRB5_CALLCONV gss_seal
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* conf_req_flag */
@@ -749,7 +747,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_buffer_t      	/* output_message_buffer */
            ));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_unseal
+OM_uint32 KRB5_CALLCONV gss_unseal
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* input_message_buffer */
@@ -759,21 +757,21 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
            ));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_name
+OM_uint32 KRB5_CALLCONV gss_export_name
 PROTOTYPE(	(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_buffer_t		/* exported_name */
 	));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_duplicate_name
+OM_uint32 KRB5_CALLCONV gss_duplicate_name
 PROTOTYPE(	(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 gss_name_t *		/* dest_name */
 	));
 
 /* New for V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_canonicalize_name
+OM_uint32 KRB5_CALLCONV gss_canonicalize_name
 PROTOTYPE(	(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 const gss_OID,		/* mech_type */
diff --git a/src/lib/gssapi/generic/gssapi_generic.c b/src/lib/gssapi/generic/gssapi_generic.c
index 11fad2bcb..3b42fbc8c 100644
--- a/src/lib/gssapi/generic/gssapi_generic.c
+++ b/src/lib/gssapi/generic/gssapi_generic.c
@@ -126,22 +126,22 @@ static gss_OID_desc oids[] = {
  * Constants of the form gss_nt_* are the original MIT krb5 names 
  * found in gssapi_generic.h.  They are provided for compatibility. */ 
 
-GSS_DLLIMP gss_OID GSS_C_NT_USER_NAME           = oids+0;
-GSS_DLLIMP gss_OID gss_nt_user_name             = oids+0;
+gss_OID GSS_C_NT_USER_NAME           = oids+0;
+gss_OID gss_nt_user_name             = oids+0;
 
-GSS_DLLIMP gss_OID GSS_C_NT_MACHINE_UID_NAME    = oids+1;
-GSS_DLLIMP gss_OID gss_nt_machine_uid_name      = oids+1;
+gss_OID GSS_C_NT_MACHINE_UID_NAME    = oids+1;
+gss_OID gss_nt_machine_uid_name      = oids+1;
 
-GSS_DLLIMP gss_OID GSS_C_NT_STRING_UID_NAME     = oids+2;
-GSS_DLLIMP gss_OID gss_nt_string_uid_name       = oids+2;
+gss_OID GSS_C_NT_STRING_UID_NAME     = oids+2;
+gss_OID gss_nt_string_uid_name       = oids+2;
 
-GSS_DLLIMP gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = oids+3;
-GSS_DLLIMP gss_OID gss_nt_service_name_v2       = oids+3;
+gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = oids+3;
+gss_OID gss_nt_service_name_v2       = oids+3;
 
-GSS_DLLIMP gss_OID GSS_C_NT_HOSTBASED_SERVICE   = oids+4;
-GSS_DLLIMP gss_OID gss_nt_service_name          = oids+4;
+gss_OID GSS_C_NT_HOSTBASED_SERVICE   = oids+4;
+gss_OID gss_nt_service_name          = oids+4;
 
-GSS_DLLIMP gss_OID GSS_C_NT_ANONYMOUS           = oids+5;
+gss_OID GSS_C_NT_ANONYMOUS           = oids+5;
 
-GSS_DLLIMP gss_OID GSS_C_NT_EXPORT_NAME         = oids+6;
-GSS_DLLIMP gss_OID gss_nt_exported_name         = oids+6;
+gss_OID GSS_C_NT_EXPORT_NAME         = oids+6;
+gss_OID gss_nt_exported_name         = oids+6;
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index f1eb68941..cc7c957e6 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -37,11 +37,11 @@
  * The correct oids (GSS_C_NT_USER_NAME, etc) from rfc 2744 
  * are defined in gssapi.h. */
 
-GSS_DLLIMP extern gss_OID gss_nt_user_name;
-GSS_DLLIMP extern gss_OID gss_nt_machine_uid_name;
-GSS_DLLIMP extern gss_OID gss_nt_string_uid_name;
-GSS_DLLIMP extern gss_OID gss_nt_service_name_v2;
-GSS_DLLIMP extern gss_OID gss_nt_service_name;
-GSS_DLLIMP extern gss_OID gss_nt_exported_name;
+extern gss_OID gss_nt_user_name;
+extern gss_OID gss_nt_machine_uid_name;
+extern gss_OID gss_nt_string_uid_name;
+extern gss_OID gss_nt_service_name_v2;
+extern gss_OID gss_nt_service_name;
+extern gss_OID gss_nt_exported_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index f036057ac..4b163c85c 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* copy_ccache.c, get_tkt_flags.c, gssapi_krb5.h, krb5_gss_glue.c,
+	set_ccache.c: Don't use GSS_DLLIMP.
+
 2001-10-01  Tom Yu  <tlyu@mit.edu>
 
 	* accept_sec_context.c (rd_and_store_for_creds): Handle error
diff --git a/src/lib/gssapi/krb5/copy_ccache.c b/src/lib/gssapi/krb5/copy_ccache.c
index 96027b494..3770cb732 100644
--- a/src/lib/gssapi/krb5/copy_ccache.c
+++ b/src/lib/gssapi/krb5/copy_ccache.c
@@ -1,6 +1,6 @@
 #include "gssapiP_krb5.h"
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
+OM_uint32 KRB5_CALLCONV 
 gss_krb5_copy_ccache(minor_status, cred_handle, out_ccache)
      OM_uint32 *minor_status;
      gss_cred_id_t cred_handle;
diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c
index 7dd5d5cc4..74f1532ae 100644
--- a/src/lib/gssapi/krb5/get_tkt_flags.c
+++ b/src/lib/gssapi/krb5/get_tkt_flags.c
@@ -26,7 +26,7 @@
  * $Id$
  */
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
+OM_uint32 KRB5_CALLCONV 
 gss_krb5_get_tkt_flags(minor_status, context_handle, ticket_flags)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index e4bac7656..755715028 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -51,17 +51,17 @@ extern const gss_OID_desc krb5_gss_oid_array[];
 #define gss_krb5_nt_machine_uid_name	gss_nt_machine_uid_name
 #define gss_krb5_nt_string_uid_name	gss_nt_string_uid_name
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags 
+OM_uint32 KRB5_CALLCONV gss_krb5_get_tkt_flags 
 	PROTOTYPE((OM_uint32 *minor_status,
 		   gss_ctx_id_t context_handle,
 		   krb5_flags *ticket_flags));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
+OM_uint32 KRB5_CALLCONV gss_krb5_copy_ccache
 	PROTOTYPE((OM_uint32 *minor_status,
 		   gss_cred_id_t cred_handle,
 		   krb5_ccache out_ccache));
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
+OM_uint32 KRB5_CALLCONV gss_krb5_ccache_name
 	PROTOTYPE((OM_uint32 *minor_status, const char *name,
 		   const char **out_name));
 
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index 9caf388c0..1d7152945 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -26,7 +26,7 @@
 
 #include "gssapiP_krb5.h"
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 		       input_token, input_chan_bindings, src_name, mech_type, 
 		       output_token, ret_flags, time_rec, delegated_cred_handle)
@@ -55,7 +55,7 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 				      delegated_cred_handle));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 		 cred_usage, output_cred_handle, actual_mechs, time_rec)
      OM_uint32 FAR *minor_status;
@@ -78,7 +78,7 @@ gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 	     cred_usage, initiator_time_req, acceptor_time_req,
 	     output_cred_handle, actual_mechs, initiator_time_rec,
@@ -103,7 +103,7 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
     OM_uint32	FAR *minor_status;
     gss_OID	member_oid;
@@ -112,7 +112,7 @@ gss_add_oid_set_member(minor_status, member_oid, oid_set)
     return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_compare_name(minor_status, name1, name2, name_equal)
      OM_uint32 FAR *minor_status;
      gss_name_t name1;
@@ -123,7 +123,7 @@ gss_compare_name(minor_status, name1, name2, name_equal)
 				name2, name_equal));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_context_time(minor_status, context_handle, time_rec)
      OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
@@ -134,7 +134,7 @@ gss_context_time(minor_status, context_handle, time_rec)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
     OM_uint32	FAR *minor_status;
     gss_OID_set	FAR *oid_set;
@@ -142,7 +142,7 @@ gss_create_empty_oid_set(minor_status, oid_set)
     return(generic_gss_create_empty_oid_set(minor_status, oid_set));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(minor_status, context_handle, output_token)
      OM_uint32 FAR *minor_status;
      gss_ctx_id_t FAR *context_handle;
@@ -152,7 +152,7 @@ gss_delete_sec_context(minor_status, context_handle, output_token)
 				      context_handle, output_token));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
      OM_uint32 FAR *minor_status;
      gss_name_t input_name;
@@ -163,7 +163,7 @@ gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
 				output_name_buffer, output_name_type));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
      OM_uint32 FAR *minor_status;
@@ -179,7 +179,7 @@ gss_display_status(minor_status, status_value, status_type,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status, context_handle, interprocess_token)
      OM_uint32		FAR *minor_status;
      gss_ctx_id_t	FAR *context_handle;
@@ -191,7 +191,7 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_get_mic(minor_status, context_handle, qop_req,
 	    message_buffer, message_token)
      OM_uint32		FAR *minor_status;
@@ -204,7 +204,7 @@ gss_get_mic(minor_status, context_handle, qop_req,
 			    qop_req, message_buffer, message_token));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
      OM_uint32 FAR *minor_status;
      gss_buffer_t input_name_buffer;
@@ -216,7 +216,7 @@ gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status, interprocess_token, context_handle)
      OM_uint32		FAR *minor_status;
      gss_buffer_t	interprocess_token;
@@ -227,7 +227,7 @@ gss_import_sec_context(minor_status, interprocess_token, context_handle)
 				      context_handle));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(minor_status, mech_set)
      OM_uint32 FAR *minor_status;
      gss_OID_set FAR *mech_set;
@@ -235,7 +235,7 @@ gss_indicate_mechs(minor_status, mech_set)
    return(krb5_gss_indicate_mechs(minor_status, mech_set));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 		     target_name, mech_type, req_flags, time_req,
 		     input_chan_bindings, input_token, actual_mech_type,
@@ -262,7 +262,7 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 				    time_rec));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated, open)
@@ -282,7 +282,7 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 				   open));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
      OM_uint32 FAR *minor_status;
@@ -297,7 +297,7 @@ gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
      OM_uint32		FAR *minor_status;
@@ -314,7 +314,7 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
     OM_uint32	FAR *minor_status;
     gss_OID	mechanism;
@@ -326,7 +326,7 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
     OM_uint32		FAR *minor_status;
     gss_OID		oid;
@@ -335,7 +335,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
     return(generic_gss_oid_to_str(minor_status, oid, oid_str));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_process_context_token(minor_status, context_handle, token_buffer)
      OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
@@ -345,7 +345,7 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 					 context_handle, token_buffer));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status, cred_handle)
      OM_uint32 FAR *minor_status;
      gss_cred_id_t FAR *cred_handle;
@@ -353,7 +353,7 @@ gss_release_cred(minor_status, cred_handle)
    return(krb5_gss_release_cred(minor_status, cred_handle));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_name(minor_status, input_name)
      OM_uint32 FAR *minor_status;
      gss_name_t FAR *input_name;
@@ -361,7 +361,7 @@ gss_release_name(minor_status, input_name)
    return(krb5_gss_release_name(minor_status, input_name));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_buffer(minor_status, buffer)
      OM_uint32 FAR *minor_status;
      gss_buffer_t buffer;
@@ -371,7 +371,7 @@ gss_release_buffer(minor_status, buffer)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
      OM_uint32	FAR *minor_status;
      gss_OID	FAR *oid;
@@ -379,7 +379,7 @@ gss_release_oid(minor_status, oid)
     return(krb5_gss_release_oid(minor_status, oid));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_oid_set(minor_status, set)
      OM_uint32 FAR * minor_status;
      gss_OID_set FAR *set;
@@ -388,7 +388,7 @@ gss_release_oid_set(minor_status, set)
 }
 
 /* V1 only */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
      OM_uint32 FAR *minor_status;
@@ -404,7 +404,7 @@ gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 			conf_state, output_message_buffer));
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_sign(minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
@@ -419,7 +419,7 @@ gss_sign(minor_status, context_handle,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_verify_mic(minor_status, context_handle,
 	       message_buffer, token_buffer, qop_state)
      OM_uint32		FAR *minor_status;
@@ -433,7 +433,7 @@ gss_verify_mic(minor_status, context_handle,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
     OM_uint32		FAR *minor_status;
@@ -450,7 +450,7 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
     OM_uint32		FAR *minor_status;
     gss_buffer_t	oid_str;
@@ -460,7 +460,7 @@ gss_str_to_oid(minor_status, oid_str, oid)
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
     OM_uint32	FAR *minor_status;
     gss_OID	member;
@@ -472,7 +472,7 @@ gss_test_oid_set_member(minor_status, member, set, present)
 }
 
 /* V1 only */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
      OM_uint32 FAR *minor_status;
@@ -488,7 +488,7 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 }
 
 /* V2 */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_unwrap(minor_status, context_handle, input_message_buffer, 
 	   output_message_buffer, conf_state, qop_state)
     OM_uint32		FAR *minor_status;
@@ -503,7 +503,7 @@ gss_unwrap(minor_status, context_handle, input_message_buffer,
 }
 
 /* V1 only */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
      OM_uint32 FAR *minor_status;
@@ -520,7 +520,7 @@ gss_verify(minor_status, context_handle, message_buffer,
 }
 
 /* V2 interface */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 		    qop_req, req_output_size, max_input_size)
     OM_uint32		FAR *minor_status;
@@ -536,7 +536,7 @@ gss_wrap_size_limit(minor_status, context_handle, conf_req_flag,
 }
 
 /* V2 interface */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_canonicalize_name(minor_status, input_name, mech_type, output_name)
 	OM_uint32  *minor_status;
 	const gss_name_t input_name;
@@ -549,7 +549,7 @@ gss_canonicalize_name(minor_status, input_name, mech_type, output_name)
 
 
 /* V2 interface */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_export_name(minor_status, input_name, exported_name)
 	OM_uint32  *minor_status;
 	const gss_name_t input_name;
@@ -559,7 +559,7 @@ gss_export_name(minor_status, input_name, exported_name)
 }
 
 /* V2 interface */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_duplicate_name(minor_status, input_name, dest_name)
 	OM_uint32  *minor_status;
 	const gss_name_t input_name;
diff --git a/src/lib/gssapi/krb5/set_ccache.c b/src/lib/gssapi/krb5/set_ccache.c
index eba22f2cd..ced403d9c 100644
--- a/src/lib/gssapi/krb5/set_ccache.c
+++ b/src/lib/gssapi/krb5/set_ccache.c
@@ -1,6 +1,6 @@
 #include "gssapiP_krb5.h"
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV 
+OM_uint32 KRB5_CALLCONV 
 gss_krb5_ccache_name(minor_status, name, out_name)
 	OM_uint32 *minor_status;
 	const char *name;
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 95e7473fe..9e546e279 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* g_acquire_cred.c, g_oid_ops.c: Don't use GSS_DLLIMP.
+
 2001-04-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (unixmac): Target deleted.
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index 8ff7da776..8ecf55f31 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -71,7 +71,7 @@ create_actual_mechs(creds)
 }
 
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status,
                  desired_name,
                  time_req,
@@ -379,7 +379,7 @@ error_out:
 }
 
 /* V2 KRB5_CALLCONV */
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle,
 		  desired_name, desired_mech, cred_usage,
 		  initiator_time_req, acceptor_time_req,
diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
index 5bb117af1..4a9d765f2 100644
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -34,7 +34,7 @@
 
 extern gss_mechanism *__gss_mechs_array;
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
     OM_uint32	*minor_status;
     gss_OID	*oid;
@@ -63,7 +63,7 @@ gss_release_oid(minor_status, oid)
     return generic_gss_release_oid(minor_status, oid);
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
     OM_uint32	*minor_status;
     gss_OID_set	*oid_set;
@@ -71,7 +71,7 @@ gss_create_empty_oid_set(minor_status, oid_set)
 	return generic_gss_create_empty_oid_set(minor_status, oid_set);
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
     OM_uint32	*minor_status;
     gss_OID	member_oid;
@@ -80,7 +80,7 @@ gss_add_oid_set_member(minor_status, member_oid, oid_set)
      return generic_gss_add_oid_set_member(minor_status, member_oid, oid_set);
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
     OM_uint32	*minor_status;
     gss_OID	member;
@@ -90,7 +90,7 @@ gss_test_oid_set_member(minor_status, member, set, present)
     return generic_gss_test_oid_set_member(minor_status, member, set, present);
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
     OM_uint32		*minor_status;
     gss_OID		oid;
@@ -99,7 +99,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
     return generic_gss_oid_to_str(minor_status, oid, oid_str);
 }
 
-GSS_DLLIMP OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
     OM_uint32		*minor_status;
     gss_buffer_t	oid_str;