Makefile.in (DLL_FILE_DEF): Tell the Makefile template that we are

	building object files for the GSSAPI DLL.

gssapi.hin, gssapi_generic.c: Change use of KRB5_DLLIMP to be GSS_DLLIMP.

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

1 files changed, 43 insertions, 42 deletions

diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index a30b794311..f6a0f5781f 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -40,6 +40,7 @@
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_DLLIMP
+#define GSS_DLLIMP
 #define KRB5_EXPORTVAR
 #endif
 #ifndef FAR
@@ -330,7 +331,7 @@ typedef	int		gss_cred_usage_t;
 extern "C" {
 #endif
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_acquire_cred
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_acquire_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t,			/* desired_name */
             OM_uint32,			/* time_req */
@@ -341,12 +342,12 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32 FAR *		/* time_rec */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_cred
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t FAR *		/* cred_handle */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_init_sec_context
+GSS_DLLIMP 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 */
@@ -362,7 +363,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32 FAR *		/* time_rec */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_accept_sec_context
+GSS_DLLIMP 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 */
@@ -376,26 +377,26 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t FAR *		/* delegated_cred_handle */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_process_context_token
+GSS_DLLIMP 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 */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_delete_sec_context
+GSS_DLLIMP 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 */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_context_time
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_get_mic
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_get_mic
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_qop_t,			/* qop_req */
@@ -404,7 +405,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify_mic
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify_mic
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* message_buffer */
@@ -413,7 +414,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
@@ -424,7 +425,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_unwrap
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_unwrap
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    gss_buffer_t,		/* input_message_buffer */
@@ -433,7 +434,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_qop_t FAR *		/* qop_state */
 	   ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_display_status
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_display_status
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             OM_uint32,			/* status_value */
             int,			/* status_type */
@@ -442,48 +443,48 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_buffer_t		/* status_string */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_indicate_mechs
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_indicate_mechs
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_OID_set FAR *		/* mech_set */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_compare_name
+GSS_DLLIMP 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 */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_display_name
+GSS_DLLIMP 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 */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_name
+GSS_DLLIMP 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 */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_name
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_name
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_name_t FAR *		/* input_name */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_buffer
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_buffer
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_buffer_t		/* buffer */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid_set
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid_set
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_OID_set FAR * 		/* set */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_cred
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_cred
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
             gss_cred_id_t,		/* cred_handle */
             gss_name_t FAR *,		/* name */
@@ -493,7 +494,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
            ));
 
 /* Last argument new for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_context
+GSS_DLLIMP 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 */
@@ -506,7 +507,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_wrap_size_limit
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_ctx_id_t,		/* context_handle */
 	    int,			/* conf_req_flag */
@@ -516,7 +517,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_name_object
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_name_object
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    void FAR *,			/* input_name */
 	    gss_OID,			/* input_name_type */
@@ -524,7 +525,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_name_object
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_name_object
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_name_t,			/* input_name */
 	    gss_OID,			/* desired_name_type */
@@ -532,7 +533,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_add_cred
+GSS_DLLIMP 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 */
@@ -547,7 +548,7 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_cred_by_mech
+GSS_DLLIMP 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 */
@@ -558,40 +559,40 @@ PROTOTYPE( (OM_uint32  FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_sec_context
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_import_sec_context
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_release_oid
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID FAR *		/* oid */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_create_empty_oid_set
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID_set FAR *		/* oid_set */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_add_oid_set_member
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_test_oid_set_member
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* member */
 	    gss_OID_set,		/* set */
@@ -599,21 +600,21 @@ PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	   ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_str_to_oid
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_oid_to_str
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_inquire_names_for_mech
 PROTOTYPE( (OM_uint32 FAR *,		/* minor_status */
 	    gss_OID,			/* mechanism */
 	    gss_OID_set FAR *		/* name_types */
@@ -626,7 +627,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.
  */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_sign
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_sign
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* qop_req */
@@ -634,7 +635,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_buffer_t      	/* message_token */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_verify
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* message_buffer */
@@ -642,7 +643,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             int FAR *           /* qop_state */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_seal
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_seal
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             int,              	/* conf_req_flag */
@@ -652,7 +653,7 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_buffer_t      	/* output_message_buffer */
            ));
 
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_unseal
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_unseal
 PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
             gss_ctx_id_t,     	/* context_handle */
             gss_buffer_t,     	/* input_message_buffer */
@@ -662,21 +663,21 @@ PROTOTYPE( (OM_uint32 FAR *,    /* minor_status */
            ));
 
 /* New for V2 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_export_name
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_duplicate_name
+GSS_DLLIMP 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 */
-KRB5_DLLIMP OM_uint32 KRB5_CALLCONV gss_canonicalize_name
+GSS_DLLIMP OM_uint32 KRB5_CALLCONV gss_canonicalize_name
 PROTOTYPE(	(OM_uint32  *,		/* minor_status */
 		 const gss_name_t,	/* input_name */
 		 const gss_OID,		/* mech_type */