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

4 files changed, 73 insertions, 70 deletions

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 9bb78bac78..38f4df1c60 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 c5f2416ba0..8fe48afcd4 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 11fad2bcb6..3b42fbc8cc 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 f1eb689418..cc7c957e6f 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_ */