Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

38 files changed, 263 insertions, 271 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index b29cc371b..e8c524b88 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
 Mon Nov 18 20:39:41 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Set shared library version to 1.0. [krb5-libs/201]
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index bd7eac736..b2410633c 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,6 +1,9 @@
 TST=if test -n "`cat DONE`" ; then
 
 ##DOSBUILDTOP = ..\..
+##DOSLIBNAME=gssapi.lib
+##DOSOBJFILELIST=@generic.lst @krb5.lst
+##DOSOBJFILEDEP=generic.lst krb5.lst
 
 MAC_SUBDIRS = generic krb5
 
@@ -19,7 +22,6 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
 all-unix::
-
 all-mac::
 
 libgssapi_krb5.$(STEXT): $(LIBDONE)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 30fd1c3c2..1456356a1 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,16 @@
+Tue Feb  4 15:55:11 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapi.hin, gssapi_generic.c, gssapi_generic.h:
+	DLL export all public gssapi functions; move windows/mac stuff to
+	win-mac.h
+
 Wed Nov 20 13:59:58 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (install): Install gssapi.h from the build tree.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 87b414f47..4b652734e 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=generic
+##DOSOBJFILE=..\generic.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -18,17 +20,21 @@ ETHDRS= gssapi_err_generic.h
 
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 
-HDRS=	$(EHDRDIR)/gssapi.h \
-	$(EHDRDIR)/gssapi_generic.h
+HDRS=	$(EHDRDIR)$(S)gssapi.h \
+	$(EHDRDIR)$(S)gssapi_generic.h
 
-gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
+$(EHDRDIR)$(S)gssapi.h: gssapi.h
+	$(CP) gssapi.h $@
+$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
+	$(CP) $(srcdir)$(S)gssapi_generic.h $@
+
+gssapi_err_generic.o: gssapi_err_generic.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
-
 gssapi_err_generic.c: gssapi_err_generic.et
 
 gssapi.h: gssapi.hin
@@ -83,22 +89,22 @@ OBJS = \
 	util_validate.$(OBJEXT) \
 	gssapi_err_generic.$(OBJEXT)
 
-$(OBJS): $(HDRS) $(ETHDRS)
-
 EXPORTED_HEADERS= gssapi_generic.h
 EXPORTED_BUILT_HEADERS= gssapi.h
 
-all-unix:: shared $(SRCS) $(ETHDRS) $(OBJS)
+$(OBJS): $(EXPORTED_HEADERS) $(ETHDRS)
 
+all-unix:: shared $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
 all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS)
+all-windows:: win-include $(HDRS) $(OBJFILE)
 
-all-windows:: $(SRCS) $(ETHDRS) win-include
-all-windows:: $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
-	copy gssapi.h $(EHDRDIR)
-	copy gssapi_generic.h $(EHDRDIR)
 
 unixmac: $(SRCS) $(ETHDRS)
 
@@ -109,7 +115,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
+	$(RM) $(HDRS) $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 4d2e14d00..685b8aa7b 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -26,82 +26,25 @@
 /*
  * Determine platform-dependent configuration.
  */
-#if defined(_MSDOS) || defined(_WIN32)
-
-#ifdef _MSDOS
-	/* Windows 16 definition */
-
-#define GSS_SIZEOF_INT      2
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
-
-#ifndef FAR
-#define FAR	_far
-#define NEAR	_near
-#endif
-
-#ifndef KRB5_CALLCONV
-#define KRB5_CALLCONV __far __export __pascal
-#define KRB5_CALLCONV_C __far __export __cdecl
-#define KRB5_DLLIMP
-#define INTERFACE   KRB5_CALLCONV
-#define INTERFACE_C KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-	
-#else
-	/* Windows 32 specific definitions */
-#define GSS_SIZEOF_INT      4
-#define GSS_SIZEOF_SHORT    2
-#define GSS_SIZEOF_LONG     4
 
-#ifndef KRB5_CALLCONV
-#ifdef KRB5_DLL_FILE
-#define KRB5_DECLSPEC dllexport
-#else
-#define KRB5_DECLSPEC dllimport
-#endif
-#define KRB5_DLLIMP __declspec(KRB5_DECLSPEC)
-#define KRB5_CALLCONV __stdcall
-#define KRB5_CALLCONV_C __cdecl
-#define INTERFACE   KRB5_DLLIMP KRB5_CALLCONV
-#define INTERFACE_C KRB5_DLLIMP KRB5_CALLCONV_C
-#endif /* !KRB5_CALLCONV */
-
-#include <windows.h>
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif /* _SIZE_T_DEFINED */
-
-#ifndef _UID_T_DEFINED
-typedef unsigned int uid_t;
-#define _UID_T_DEFINED
+#if defined(_MSDOS) || defined(_WIN32)
+#include <win-mac.h>
 #endif
-#else /* _MSDOS_ */
 
 #ifndef KRB5_CALLCONV
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_DLLIMP
-#define INTERFACE
-#define INTERFACE_C
+#endif
+
+#ifndef FAR
 #define FAR
 #define NEAR
-#endif /* !KRB5_CALLCONV */
+#endif
 
 #define	GSS_SIZEOF_INT		SIZEOF_INT
 #define	GSS_SIZEOF_LONG		SIZEOF_LONG
 #define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
-#endif /* _MSDOS */
-
-#ifndef FAR
-#define FAR
-#endif
-#ifndef NEAR
-#define NEAR
-#endif
 
 /*
  * Make sure we have a definition for PROTOTYPE.
diff --git a/src/lib/gssapi/generic/gssapi_generic.c b/src/lib/gssapi/generic/gssapi_generic.c
index 7072329b7..b078104d2 100644
--- a/src/lib/gssapi/generic/gssapi_generic.c
+++ b/src/lib/gssapi/generic/gssapi_generic.c
@@ -53,7 +53,7 @@ static gss_OID_desc oids[] = {
    {10, "\052\206\110\206\367\022\001\002\001\004"},
 };
 
-gss_OID gss_nt_user_name = oids+0;
-gss_OID gss_nt_machine_uid_name = oids+1;
-gss_OID gss_nt_string_uid_name = oids+2;
-gss_OID gss_nt_service_name = oids+3;
+KRB5_DLLIMP gss_OID gss_nt_user_name = oids+0;
+KRB5_DLLIMP gss_OID gss_nt_machine_uid_name = oids+1;
+KRB5_DLLIMP gss_OID gss_nt_string_uid_name = oids+2;
+KRB5_DLLIMP gss_OID gss_nt_service_name = oids+3;
diff --git a/src/lib/gssapi/generic/gssapi_generic.h b/src/lib/gssapi/generic/gssapi_generic.h
index 09a9810b0..7b48d396f 100644
--- a/src/lib/gssapi/generic/gssapi_generic.h
+++ b/src/lib/gssapi/generic/gssapi_generic.h
@@ -33,9 +33,9 @@
 #include <gssapi/gssapi.h>
 #endif
 
-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;
+KRB5_DLLIMP extern gss_OID gss_nt_user_name;
+KRB5_DLLIMP extern gss_OID gss_nt_machine_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_string_uid_name;
+KRB5_DLLIMP extern gss_OID gss_nt_service_name;
 
 #endif /* _GSSAPI_GENERIC_H_ */
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 8f9ac2c0d..67bf46319 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,9 +1,26 @@
+Wed Feb  5 20:27:50 1997  Richard Basch  <basch@lehman.com>
+
+	* acquire_cred.c (acquire_accept_cred): Removed unused local variable
+
+Tue Feb  4 15:56:01 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in: Only override the object build of the error table
+		under Unix
+
 Wed Dec  4 13:06:13 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* acquire_cred.c (acquire_accept_cred): use krb5_kt_get_entry
  	instead of scanning through keytab to find matching principal
  	[krb5-libs/210]
 
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* gssapiP_krb5.h krb5_gss_glue.c:
+	DLL export all public GSSAPI interfaces; adjusted some other
+	declarations accordingly (KRB5_CALLCONV, FAR keywords added)
+
 Wed Nov 20 19:55:29 1996  Marc Horowitz  <marc@cygnus.com>
 
 	* init_sec_context.c (make_ap_rep, krb5_gss_init_sec_context),
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index d48db0291..45db67345 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,18 +1,14 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic -DUSE_AUTOCONF_H
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\gssapi.$(LIBEXT)
+##DOSMYNAME=krb5
+##DOSOBJFILE = ..\krb5.lst
+##WIN16##LIBNAME=..\gssapi.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
 
-all-unix:: shared $(OBJS)
-
-all-mac:: shared $(OBJS)
-
-all-windows:: $(OBJS)
-
 shared:
 	mkdir shared
 
@@ -20,14 +16,13 @@ ETSRCS= gssapi_err_krb5.c
 ETOBJS= gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
+gssapi_err_krb5.o: gssapi_err_krb5.c
 	$(CC) $(CFLAGS) -c $*.c
+
 @SHARED_RULE_LOCAL@
-##WIN16##	$(LIBCMD) $(PAGESIZE) /nologo $(LIBNAME) -+$@;
-##WIN32##	$(LIBCMD) /out:$(LIBNAME) /nologo $@
 
+gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 gssapi_err_krb5.h: gssapi_err_krb5.et
-
 gssapi_err_krb5.c: gssapi_err_krb5.et
 
 SRCS = \
@@ -115,9 +110,14 @@ HDRS= $(ETHDRS)
 EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi_krb5.h
 
-all-unix:: $(SRCS) $(HDRS) includes $(OBJS)
-all-mac:: $(SRCS) $(HDRS) includes $(OBJS)
-all-windows:: win-include $(SRCS) $(HDRS) $(OBJS)
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj >$(OBJFILE)
+
+all-unix:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-mac:: shared $(SRCS) $(HDRS) includes $(OBJS)
+all-windows:: win-include $(SRCS) $(HDRS) $(OBJS) $(OBJFILE)
 
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
@@ -130,7 +130,7 @@ clean-mac::
 	$(RM) $(ETHDRS) $(ETSRCS) shared/*
 
 clean-windows::
-	$(RM) $(EHDRDIR)\gssapi_krb5.h
+	$(RM) $(EHDRDIR)\gssapi_krb5.h $(OBJFILE)
 	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
 
 install::
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index a99177758..8f1935038 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -50,7 +50,6 @@ acquire_accept_cred(context, minor_status, desired_name, output_princ, cred)
    krb5_principal princ;
    krb5_keytab kt;
    krb5_keytab_entry entry;
-   krb5_kt_cursor cur;
 
    *output_princ = NULL;
    cred->keytab = NULL;
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 97f2d51d5..d7b01e021 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -27,11 +27,7 @@
  * $Id$
  */
 
-#if (defined(_MSDOS) || defined(_WIN32) || defined(_MACINTOSH))
-#include <k5-int.h>
-#else
 #include <krb5.h>
-#endif
 #include <memory.h>
 
 /* work around sunos braindamage */
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index fe3b0208f..8155d8577 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -26,21 +26,21 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_cred_id_t verifier_cred_handle;
      gss_buffer_t input_token;
      gss_channel_bindings_t input_chan_bindings;
-     gss_name_t *src_name;
-     gss_OID *mech_type;
+     gss_name_t FAR *src_name;
+     gss_OID FAR *mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
-     gss_cred_id_t *delegated_cred_handle;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
+     gss_cred_id_t FAR *delegated_cred_handle;
 {
    return(krb5_gss_accept_sec_context(minor_status,
 				      context_handle,
@@ -55,17 +55,17 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 				      delegated_cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t desired_name;
      OM_uint32 time_req;
      gss_OID_set desired_mechs;
      gss_cred_usage_t cred_usage;
-     gss_cred_id_t *output_cred_handle;
-     gss_OID_set *actual_mechs;
-     OM_uint32 *time_rec;
+     gss_cred_id_t FAR *output_cred_handle;
+     gss_OID_set FAR *actual_mechs;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_acquire_cred(minor_status,
 				desired_name,
@@ -78,22 +78,22 @@ gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 }
 
 /* V2 */
-OM_uint32 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,
 	     output_cred_handle, actual_mechs, initiator_time_rec,
 	     acceptor_time_rec)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_cred_id_t	input_cred_handle;
     gss_name_t		desired_name;
     gss_OID		desired_mech;
     gss_cred_usage_t	cred_usage;
     OM_uint32		initiator_time_req;
     OM_uint32		acceptor_time_req;
-    gss_cred_id_t	*output_cred_handle;
-    gss_OID_set		*actual_mechs;
-    OM_uint32		*initiator_time_rec;
-    OM_uint32		*acceptor_time_rec;
+    gss_cred_id_t	FAR *output_cred_handle;
+    gss_OID_set		FAR *actual_mechs;
+    OM_uint32		FAR *initiator_time_rec;
+    OM_uint32		FAR *acceptor_time_rec;
 {
     return(krb5_gss_add_cred(minor_status, input_cred_handle, desired_name,
 			     desired_mech, cred_usage, initiator_time_req,
@@ -103,74 +103,74 @@ gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_oid_set_member(minor_status, member_oid, oid_set)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member_oid;
-    gss_OID_set	*oid_set;
+    gss_OID_set	FAR *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_compare_name(minor_status, name1, name2, name_equal)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t name1;
      gss_name_t name2;
-     int *name_equal;
+     int FAR *name_equal;
 {
    return(krb5_gss_compare_name(minor_status, name1,
 				name2, name_equal));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_context_time(minor_status, context_handle, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_context_time(minor_status, context_handle,
 				time_rec));
 }
 
 /* V2 */
-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;
+    OM_uint32	FAR *minor_status;
+    gss_OID_set	FAR *oid_set;
 {
     return(generic_gss_create_empty_oid_set(minor_status, oid_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(minor_status, context_handle, output_token)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
+     OM_uint32 FAR *minor_status;
+     gss_ctx_id_t FAR *context_handle;
      gss_buffer_t output_token;
 {
    return(krb5_gss_delete_sec_context(minor_status,
 				      context_handle, output_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_name_t input_name;
      gss_buffer_t output_name_buffer;
-     gss_OID *output_name_type;
+     gss_OID FAR *output_name_type;
 {
    return(krb5_gss_display_name(minor_status, input_name,
 				output_name_buffer, output_name_type));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      OM_uint32 status_value;
      int status_type;
      gss_OID mech_type;
-     OM_uint32 *message_context;
+     OM_uint32 FAR *message_context;
      gss_buffer_t status_string;
 {
    return(krb5_gss_display_status(minor_status, status_value,
@@ -179,10 +179,10 @@ gss_display_status(minor_status, status_value, status_type,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status, context_handle, interprocess_token)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	*context_handle;
+     OM_uint32		FAR *minor_status;
+     gss_ctx_id_t	FAR *context_handle;
      gss_buffer_t	interprocess_token;
 {
    return(krb5_gss_export_sec_context(minor_status,
@@ -191,10 +191,10 @@ gss_export_sec_context(minor_status, context_handle, interprocess_token)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_get_mic(minor_status, context_handle, qop_req,
 	    message_buffer, message_token)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_qop_t		qop_req;
      gss_buffer_t	message_buffer;
@@ -204,55 +204,55 @@ gss_get_mic(minor_status, context_handle, qop_req,
 			    qop_req, message_buffer, message_token));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t input_name_buffer;
      gss_OID input_name_type;
-     gss_name_t *output_name;
+     gss_name_t FAR *output_name;
 {
    return(krb5_gss_import_name(minor_status, input_name_buffer,
 			       input_name_type, output_name));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status, interprocess_token, context_handle)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_buffer_t	interprocess_token;
-     gss_ctx_id_t	*context_handle;
+     gss_ctx_id_t	FAR *context_handle;
 {
    return(krb5_gss_import_sec_context(minor_status,
 				      interprocess_token,
 				      context_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(minor_status, mech_set)
-     OM_uint32 *minor_status;
-     gss_OID_set *mech_set;
+     OM_uint32 FAR *minor_status;
+     gss_OID_set FAR *mech_set;
 {
    return(krb5_gss_indicate_mechs(minor_status, mech_set));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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,
 		     output_token, ret_flags, time_rec)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t claimant_cred_handle;
-     gss_ctx_id_t *context_handle;
+     gss_ctx_id_t FAR *context_handle;
      gss_name_t target_name;
      gss_OID mech_type;
      OM_uint32 req_flags;
      OM_uint32 time_req;
      gss_channel_bindings_t input_chan_bindings;
      gss_buffer_t input_token;
-     gss_OID *actual_mech_type;
+     gss_OID FAR *actual_mech_type;
      gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
+     OM_uint32 FAR *ret_flags;
+     OM_uint32 FAR *time_rec;
 {
    return(krb5_gss_init_sec_context(minor_status,
 				    claimant_cred_handle, context_handle,
@@ -262,19 +262,19 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 				    time_rec));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated, open)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
-     gss_name_t *initiator_name;
-     gss_name_t *acceptor_name;
-     OM_uint32 *lifetime_rec;
-     gss_OID *mech_type;
-     OM_uint32 *ret_flags;
-     int *locally_initiated;
-     int *open;
+     gss_name_t FAR *initiator_name;
+     gss_name_t FAR *acceptor_name;
+     OM_uint32 FAR *lifetime_rec;
+     gss_OID FAR *mech_type;
+     OM_uint32 FAR *ret_flags;
+     int FAR *locally_initiated;
+     int FAR *open;
 {
    return(krb5_gss_inquire_context(minor_status, context_handle,
 				   initiator_name, acceptor_name, lifetime_rec,
@@ -282,31 +282,31 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 				   open));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_cred_id_t cred_handle;
-     gss_name_t *name;
-     OM_uint32 *lifetime_ret;
-     gss_cred_usage_t *cred_usage;
-     gss_OID_set *mechanisms;
+     gss_name_t FAR *name;
+     OM_uint32 FAR *lifetime_ret;
+     gss_cred_usage_t FAR *cred_usage;
+     gss_OID_set FAR *mechanisms;
 {
    return(krb5_gss_inquire_cred(minor_status, cred_handle,
 				name, lifetime_ret, cred_usage, mechanisms));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_cred_id_t	cred_handle;
      gss_OID		mech_type;
-     gss_name_t		*name;
-     OM_uint32		*initiator_lifetime;
-     OM_uint32		*acceptor_lifetime;
-     gss_cred_usage_t	*cred_usage;
+     gss_name_t		FAR *name;
+     OM_uint32		FAR *initiator_lifetime;
+     OM_uint32		FAR *acceptor_lifetime;
+     gss_cred_usage_t	FAR *cred_usage;
 {
    return(krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
 					mech_type, name, initiator_lifetime,
@@ -314,11 +314,11 @@ gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	mechanism;
-    gss_OID_set	*name_types;
+    gss_OID_set	FAR *name_types;
 {
     return(krb5_gss_inquire_names_for_mech(minor_status,
 					   mechanism,
@@ -326,18 +326,18 @@ gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_oid_to_str(minor_status, oid, oid_str)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_OID		oid;
     gss_buffer_t	oid_str;
 {
     return(generic_gss_oid_to_str(minor_status, oid, oid_str));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_process_context_token(minor_status, context_handle, token_buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t token_buffer;
 {
@@ -345,25 +345,25 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 					 context_handle, token_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status, cred_handle)
-     OM_uint32 *minor_status;
-     gss_cred_id_t *cred_handle;
+     OM_uint32 FAR *minor_status;
+     gss_cred_id_t FAR *cred_handle;
 {
    return(krb5_gss_release_cred(minor_status, cred_handle));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_name(minor_status, input_name)
-     OM_uint32 *minor_status;
-     gss_name_t *input_name;
+     OM_uint32 FAR *minor_status;
+     gss_name_t FAR *input_name;
 {
    return(krb5_gss_release_name(minor_status, input_name));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_buffer(minor_status, buffer)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_buffer_t buffer;
 {
    return(generic_gss_release_buffer(minor_status,
@@ -371,32 +371,32 @@ gss_release_buffer(minor_status, buffer)
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid(minor_status, oid)
-     OM_uint32	*minor_status;
-     gss_OID	*oid;
+     OM_uint32	FAR *minor_status;
+     gss_OID	FAR *oid;
 {
     return(krb5_gss_release_oid(minor_status, oid));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_release_oid_set(minor_status, set)
-     OM_uint32* minor_status;
-     gss_OID_set *set;
+     OM_uint32 FAR * minor_status;
+     gss_OID_set FAR *set;
 {
    return(generic_gss_release_oid_set(minor_status, set));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int conf_req_flag;
      int qop_req;
      gss_buffer_t input_message_buffer;
-     int *conf_state;
+     int FAR *conf_state;
      gss_buffer_t output_message_buffer;
 {
    return(krb5_gss_seal(minor_status, context_handle,
@@ -404,11 +404,11 @@ gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 			conf_state, output_message_buffer));
 }
 
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_sign(minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      int qop_req;
      gss_buffer_t message_buffer;
@@ -419,29 +419,29 @@ gss_sign(minor_status, context_handle,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify_mic(minor_status, context_handle,
 	       message_buffer, token_buffer, qop_state)
-     OM_uint32		*minor_status;
+     OM_uint32		FAR *minor_status;
      gss_ctx_id_t	context_handle;
      gss_buffer_t	message_buffer;
      gss_buffer_t	token_buffer;
-     gss_qop_t		*qop_state;
+     gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_verify_mic(minor_status, context_handle,
 			       message_buffer, token_buffer, qop_state));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     gss_buffer_t	input_message_buffer;
-    int			*conf_state;
+    int			FAR *conf_state;
     gss_buffer_t	output_message_buffer;
 {
     return(krb5_gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
@@ -450,37 +450,37 @@ gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_str_to_oid(minor_status, oid_str, oid)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_buffer_t	oid_str;
-    gss_OID		*oid;
+    gss_OID		FAR *oid;
 {
     return(generic_gss_str_to_oid(minor_status, oid_str, oid));
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_test_oid_set_member(minor_status, member, set, present)
-    OM_uint32	*minor_status;
+    OM_uint32	FAR *minor_status;
     gss_OID	member;
     gss_OID_set	set;
-    int		*present;
+    int		FAR *present;
 {
     return(generic_gss_test_oid_set_member(minor_status, member, set,
 					   present));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t input_message_buffer;
      gss_buffer_t output_message_buffer;
-     int *conf_state;
-     int *qop_state;
+     int FAR *conf_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_unseal(minor_status, context_handle,
 			  input_message_buffer, output_message_buffer,
@@ -488,29 +488,29 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 }
 
 /* V2 */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_unwrap(minor_status, context_handle, input_message_buffer, 
 	   output_message_buffer, conf_state, qop_state)
-    OM_uint32		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     gss_buffer_t	input_message_buffer;
     gss_buffer_t	output_message_buffer;
-    int			*conf_state;
-    gss_qop_t		*qop_state;
+    int			FAR *conf_state;
+    gss_qop_t		FAR *qop_state;
 {
     return(krb5_gss_unwrap(minor_status, context_handle, input_message_buffer,
 			   output_message_buffer, conf_state, qop_state));
 }
 
 /* V1 only */
-OM_uint32 INTERFACE
+KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
-     OM_uint32 *minor_status;
+     OM_uint32 FAR *minor_status;
      gss_ctx_id_t context_handle;
      gss_buffer_t message_buffer;
      gss_buffer_t token_buffer;
-     int *qop_state;
+     int FAR *qop_state;
 {
    return(krb5_gss_verify(minor_status,
 			  context_handle,
@@ -520,15 +520,15 @@ gss_verify(minor_status, context_handle, message_buffer,
 }
 
 /* V2 interface */
-OM_uint32 INTERFACE
+KRB5_DLLIMP 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		*minor_status;
+    OM_uint32		FAR *minor_status;
     gss_ctx_id_t	context_handle;
     int			conf_req_flag;
     gss_qop_t		qop_req;
     OM_uint32		req_output_size;
-    OM_uint32		*max_input_size;
+    OM_uint32		FAR *max_input_size;
 {
    return(krb5_gss_wrap_size_limit(minor_status, context_handle,
 				   conf_req_flag, qop_req,
diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c
index 22b5c367c..36e70d742 100644
--- a/src/lib/gssapi/krb5/ser_sctx.c
+++ b/src/lib/gssapi/krb5/ser_sctx.c
@@ -25,6 +25,7 @@
 /*
  * ser_sctx.c - Handle [de]serialization of GSSAPI security context.
  */
+#include "k5-int.h"
 #include "gssapiP_krb5.h"
 
 /*
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9f8fb1bc4..35c48afca 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,14 @@
+Wed Feb  5 10:37:00 1996  Richard Basch  <basch@lehman.com>
+
+	* g_accept_sec_context.c g_acquire_cred.c g_compare_name.c
+	  g_context_time.c g_delete_sec_context.c g_dsp_name.c
+	  g_dsp_status.c g_exp_sec_context.c g_imp_name.c
+	  g_imp_sec_context.c g_indicate_mechs.c g_init_sec_context.c
+	  g_inq_context.c g_inq_cred.c g_inq_names.c g_process_context.c
+	  g_rel_buffer.c g_rel_cred.c g_rel_name.c g_rel_oid_set.c
+	  g_seal.c g_sign.c g_unseal.c g_verify.c
+		Changed INTERFACE keyword to KRB5_CALLCONV
+
 Mon Nov 18 20:43:54 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Shared library version number to 1.0. [krb5-libs/201]
diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
index 286dc2432..8cc752fe7 100644
--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <errno.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context (minor_status,
                         context_handle,
                         verifier_cred_handle,
diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c
index 97bc8e0f5..d6ff8897a 100644
--- a/src/lib/gssapi/mechglue/g_acquire_cred.c
+++ b/src/lib/gssapi/mechglue/g_acquire_cred.c
@@ -378,7 +378,7 @@ error_out:
     return(status);
 }
 
-/* V2 INTERFACE */
+/* V2 KRB5_CALLCONV */
 KRB5_DLLIMP OM_uint32 KRB5_CALLCONV
 gss_add_cred(minor_status, input_cred_handle,
 		  desired_name, desired_mech, cred_usage,
diff --git a/src/lib/gssapi/mechglue/g_compare_name.c b/src/lib/gssapi/mechglue/g_compare_name.c
index 97e08d0f0..851be4a85 100644
--- a/src/lib/gssapi/mechglue/g_compare_name.c
+++ b/src/lib/gssapi/mechglue/g_compare_name.c
@@ -37,7 +37,7 @@
    (((o1)->length == (o2)->length) && \
     (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_compare_name (minor_status,
                   name1,
                   name2,
diff --git a/src/lib/gssapi/mechglue/g_context_time.c b/src/lib/gssapi/mechglue/g_context_time.c
index 7351564f5..6f08c9224 100644
--- a/src/lib/gssapi/mechglue/g_context_time.c
+++ b/src/lib/gssapi/mechglue/g_context_time.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_context_time (minor_status,
                   context_handle,
                   time_rec)
diff --git a/src/lib/gssapi/mechglue/g_delete_sec_context.c b/src/lib/gssapi/mechglue/g_delete_sec_context.c
index 5138569e2..fae0b0ac3 100644
--- a/src/lib/gssapi/mechglue/g_delete_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_delete_sec_context.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE 
+OM_uint32 KRB5_CALLCONV 
 gss_delete_sec_context (minor_status,
                         context_handle,
                         output_token)
diff --git a/src/lib/gssapi/mechglue/g_dsp_name.c b/src/lib/gssapi/mechglue/g_dsp_name.c
index c7abaf9b1..8bd0426c3 100644
--- a/src/lib/gssapi/mechglue/g_dsp_name.c
+++ b/src/lib/gssapi/mechglue/g_dsp_name.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_display_name (minor_status,
                   input_name,
                   output_name_buffer,
diff --git a/src/lib/gssapi/mechglue/g_dsp_status.c b/src/lib/gssapi/mechglue/g_dsp_status.c
index 3c6e5785b..4b58c38f7 100644
--- a/src/lib/gssapi/mechglue/g_dsp_status.c
+++ b/src/lib/gssapi/mechglue/g_dsp_status.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_display_status (minor_status,
                     status_value,
                     status_type,
diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c
index 61488c70b..958553b49 100644
--- a/src/lib/gssapi/mechglue/g_exp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(minor_status,
                        context_handle,
                        interprocess_token)
diff --git a/src/lib/gssapi/mechglue/g_imp_name.c b/src/lib/gssapi/mechglue/g_imp_name.c
index 3e90d36e4..e93b4c9ac 100644
--- a/src/lib/gssapi/mechglue/g_imp_name.c
+++ b/src/lib/gssapi/mechglue/g_imp_name.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <errno.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_import_name(minor_status,
                 input_name_buffer,
                 input_name_type,
diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c
index c7ed23d6b..eed9bbeda 100644
--- a/src/lib/gssapi/mechglue/g_imp_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c
@@ -34,7 +34,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(minor_status,
                        interprocess_token,
                        context_handle)
diff --git a/src/lib/gssapi/mechglue/g_indicate_mechs.c b/src/lib/gssapi/mechglue/g_indicate_mechs.c
index 4bf7eed73..334f7c1b9 100644
--- a/src/lib/gssapi/mechglue/g_indicate_mechs.c
+++ b/src/lib/gssapi/mechglue/g_indicate_mechs.c
@@ -38,7 +38,7 @@ extern gss_mechanism *__gss_mechs_array;
 static gss_OID_set_desc	supported_mechs_desc; 
 static gss_OID_set supported_mechs = NULL;
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs (minor_status,
                     mech_set)
 
diff --git a/src/lib/gssapi/mechglue/g_init_sec_context.c b/src/lib/gssapi/mechglue/g_init_sec_context.c
index 96d678332..1e19c57e4 100644
--- a/src/lib/gssapi/mechglue/g_init_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_init_sec_context.c
@@ -37,7 +37,7 @@
    (((o1)->length == (o2)->length) && \
     (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_init_sec_context (minor_status,
                       claimant_cred_handle,
                       context_handle,
diff --git a/src/lib/gssapi/mechglue/g_inq_context.c b/src/lib/gssapi/mechglue/g_inq_context.c
index 105d203f8..3f28c484f 100644
--- a/src/lib/gssapi/mechglue/g_inq_context.c
+++ b/src/lib/gssapi/mechglue/g_inq_context.c
@@ -32,7 +32,7 @@
 #endif
 
 /* Last argument new for V2 */
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_context(
 	    minor_status,
 	    context_handle,
diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c
index 27412df02..e0a2bc4a8 100644
--- a/src/lib/gssapi/mechglue/g_inq_cred.c
+++ b/src/lib/gssapi/mechglue/g_inq_cred.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <time.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(minor_status,
                  cred_handle,
                  name,
@@ -159,7 +159,7 @@ gss_OID_set *		mechanisms;
     return(GSS_S_COMPLETE);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
 			 initiator_lifetime, acceptor_lifetime, cred_usage)
     OM_uint32		*minor_status;
diff --git a/src/lib/gssapi/mechglue/g_inq_names.c b/src/lib/gssapi/mechglue/g_inq_names.c
index 971595191..7c07f44ed 100644
--- a/src/lib/gssapi/mechglue/g_inq_names.c
+++ b/src/lib/gssapi/mechglue/g_inq_names.c
@@ -29,7 +29,7 @@
 #include "mglueP.h"
 
 /* Last argument new for V2 */
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(minor_status, mechanism, name_types)
 
 OM_uint32 *	minor_status;
diff --git a/src/lib/gssapi/mechglue/g_process_context.c b/src/lib/gssapi/mechglue/g_process_context.c
index b09b2a6f5..dcb4716bc 100644
--- a/src/lib/gssapi/mechglue/g_process_context.c
+++ b/src/lib/gssapi/mechglue/g_process_context.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_process_context_token (minor_status,
                            context_handle,
                            token_buffer)
diff --git a/src/lib/gssapi/mechglue/g_rel_buffer.c b/src/lib/gssapi/mechglue/g_rel_buffer.c
index b39f3057e..6f8367a1d 100644
--- a/src/lib/gssapi/mechglue/g_rel_buffer.c
+++ b/src/lib/gssapi/mechglue/g_rel_buffer.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_buffer (minor_status,
 		    buffer)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_cred.c b/src/lib/gssapi/mechglue/g_rel_cred.c
index 092492e7f..44d82709e 100644
--- a/src/lib/gssapi/mechglue/g_rel_cred.c
+++ b/src/lib/gssapi/mechglue/g_rel_cred.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_cred(minor_status,
                  cred_handle)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_name.c b/src/lib/gssapi/mechglue/g_rel_name.c
index 101b73009..29c3f9819 100644
--- a/src/lib/gssapi/mechglue/g_rel_name.c
+++ b/src/lib/gssapi/mechglue/g_rel_name.c
@@ -33,7 +33,7 @@
 #endif
 #include <string.h>
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_name (minor_status,
 		  input_name)
 
diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c
index e52057f22..357c00e67 100644
--- a/src/lib/gssapi/mechglue/g_rel_oid_set.c
+++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #endif
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_release_oid_set (minor_status,
 		     set)
 
diff --git a/src/lib/gssapi/mechglue/g_seal.c b/src/lib/gssapi/mechglue/g_seal.c
index 412202dee..7d66e469a 100644
--- a/src/lib/gssapi/mechglue/g_seal.c
+++ b/src/lib/gssapi/mechglue/g_seal.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_seal (minor_status,
           context_handle,
           conf_req_flag,
@@ -83,7 +83,7 @@ gss_buffer_t		output_message_buffer;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_wrap (minor_status,
           context_handle,
           conf_req_flag,
@@ -109,7 +109,7 @@ gss_buffer_t		output_message_buffer;
 /*
  * New for V2
  */
-OM_uint32 INTERFACE
+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		*minor_status;
diff --git a/src/lib/gssapi/mechglue/g_sign.c b/src/lib/gssapi/mechglue/g_sign.c
index 78eee681d..4dfd3ec71 100644
--- a/src/lib/gssapi/mechglue/g_sign.c
+++ b/src/lib/gssapi/mechglue/g_sign.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_sign (minor_status,
           context_handle,
           qop_req,
@@ -77,7 +77,7 @@ gss_buffer_t		msg_token;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_get_mic (minor_status,
           context_handle,
           qop_req,
diff --git a/src/lib/gssapi/mechglue/g_unseal.c b/src/lib/gssapi/mechglue/g_unseal.c
index 35cab05e2..9ca1c1512 100644
--- a/src/lib/gssapi/mechglue/g_unseal.c
+++ b/src/lib/gssapi/mechglue/g_unseal.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_unseal (minor_status,
             context_handle,
             input_message_buffer,
@@ -80,7 +80,7 @@ int *			qop_state;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_unwrap (minor_status,
             context_handle,
             input_message_buffer,
diff --git a/src/lib/gssapi/mechglue/g_verify.c b/src/lib/gssapi/mechglue/g_verify.c
index 53ed26268..7fc86b448 100644
--- a/src/lib/gssapi/mechglue/g_verify.c
+++ b/src/lib/gssapi/mechglue/g_verify.c
@@ -28,7 +28,7 @@
 
 #include "mglueP.h"
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_verify (minor_status,
             context_handle,
             message_buffer,
@@ -77,7 +77,7 @@ int *			qop_state;
     return(GSS_S_NO_CONTEXT);
 }
 
-OM_uint32 INTERFACE
+OM_uint32 KRB5_CALLCONV
 gss_verify_mic (minor_status,
             context_handle,
             message_buffer,