Makefile.in: Remove include of config/windows.in; that's done

	automatically by wconfig.

g_acquire_cred.c, g_oid_ops.c: Change to use new convention of
	KRB5_CALLCONV and KRB5_DLLIMP instead of INTERFACE

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

4 files changed, 17 insertions, 11 deletions

diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 78a13600fc..97558b1a2f 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 12 00:50:32 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Remove include of config/windows.in; that's done
+		automatically by wconfig.
+
+	* g_acquire_cred.c, g_oid_ops.c: Change to use new convention of
+		KRB5_CALLCONV and KRB5_DLLIMP instead of INTERFACE
+
 Wed May 22 07:48:21 1996  Sam Hartman  <hartmans@mit.edu>
 
 	* Makefile.in (libgssapi.$(STEXT)): Remove unnecessary install rule for libgssapi.a.
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index bef8b28a4a..ae86a4fa7e 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -2,8 +2,6 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\gssapi.$(LIBEXT)
-##DOSsrcdir = .
-##DOS!include $(BUILDTOP)\config\windows.in
 
 LIBDONE=DONE
 LIB_SUBDIRS=.
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index dfa875c716..97bc8e0f51 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)
 }
 
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(minor_status,
                  desired_name,
                  time_req,
@@ -378,8 +378,8 @@ error_out:
     return(status);
 }
 
-/* V2 interface */
-OM_uint32 INTERFACE
+/* V2 INTERFACE */
+KRB5_DLLIMP 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 3852985841..010e2a85b5 100644
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -31,7 +31,7 @@
 
 extern gss_mechanism *__gss_mechs_array;
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
     OM_uint32	*minor_status;
     gss_OID	*oid;
@@ -60,7 +60,7 @@ gss_release_oid(minor_status, oid)
     return generic_gss_release_oid(minor_status, oid);
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_create_empty_oid_set(minor_status, oid_set)
     OM_uint32	*minor_status;
     gss_OID_set	*oid_set;
@@ -68,7 +68,7 @@ gss_create_empty_oid_set(minor_status, oid_set)
 	return generic_gss_create_empty_oid_set(minor_status, oid_set);
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
     OM_uint32	*minor_status;
     gss_OID	member_oid;
@@ -77,7 +77,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);
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
     OM_uint32	*minor_status;
     gss_OID	member;
@@ -87,7 +87,7 @@ gss_test_oid_set_member(minor_status, member, set, present)
     return generic_gss_test_oid_set_member(minor_status, member, set, present);
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
     OM_uint32		*minor_status;
     gss_OID		oid;
@@ -96,7 +96,7 @@ gss_oid_to_str(minor_status, oid, oid_str)
     return generic_gss_oid_to_str(minor_status, oid, oid_str);
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
     OM_uint32		*minor_status;
     gss_buffer_t	oid_str;