PC'fied gssapi directories. Mostly changing Makefile.in and adding the

windows INTERFACE keyword to functions. A few int/long fixes.

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

49 files changed, 317 insertions, 226 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 77257b5e7..2bd94d756 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 20 21:38:20 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: made to work on the PC
+
 Fri Nov 18 00:17:29 1994  Mark Eichin  <eichin@cygnus.com>
 
 	* configure.in: move WITH_CCOPTS.
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index c053508fc..06c409113 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,6 +1,12 @@
 TST=if test -n "`cat DONE`" ; then
 
-all::
+##DOSBUILDTOP = ..\..
+##DOSLIBNAME=libgssapi_krb5.$(LIBEXT)
+##DOS!include $(BUILDTOP)\config\windows.in
+
+all:: all-$(WHAT)
+
+all-unix::
 
 libgssapi_krb5.a: generic/DONE krb5/DONE
 	(cd generic; $(TST) $(ARADD) ../$@ `cat DONE` ; fi)
@@ -11,5 +17,27 @@ install:: libgssapi_krb5.a
 	$(INSTALL_DATA) libgssapi_krb5.a $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
 	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libgssapi_krb5.a
 
-clean::
-	$(RM) libgssapi_krb5.a
+clean:: clean-$(WHAT)
+	$(RM) libgssapi_krb5.$(LIBEXT) libgssapi_krb5.bak
+
+clean-unix::
+
+all-windows::
+	cd generic
+	@echo Making in ..\generic
+	-$(MAKE) -$(MFLAGS) LIB=$(LIB)
+	cd ..\krb5
+	@echo Making in krb5
+	-$(MAKE) -$(MFLAGS) LIB=$(LIB)
+	cd ..
+
+clean-windows::
+	cd generic
+	@echo Making clean in ..\generic
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..\krb5
+	@echo Making clean in krb5
+	-$(MAKE) -$(MFLAGS) clean
+	cd ..
+
+
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index a1d1298d7..69d5aebd6 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,17 @@
+Mon Feb 20 18:50:33 1995 Keith Vetter (keithv@fusion.com)
+
+	* Makefile.in: made to work on the PC
+        * Added windows INTERFACE keyword
+          disp_com.c disp_maj.c rel_buff.c rel_oid_.c
+          util_buf.c util_can.c util_dup.c util_oid.c
+          util_tok.c util_val.c utl_noha.c
+        * gssapiP_generic.h: 
+          added INTERFACE keyword
+          removed inclusion
+        * util_tok.c: had to coerce long to int on TWRITE_STR.
+        * gssapi.h: made typedef for OM_uint32 machine independent and
+          added INTERFACE to prototypes.
+
 Mon Feb 20 12:00:00 1994  Keith Vetter (keithv@fusion.com)
 
 	More DOS 8.3 renames--for files created by make
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 251a9ac07..182c307e9 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,13 +1,18 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 LDFLAGS = -g
 
+##DOSBUILDTOP = ..\..\..
+##DOSLIBNAME=..\libgssapi_krb5.$(LIBEXT)
+##DOSsrcdir = .
+##DOS!include $(BUILDTOP)\config\windows.in
+
 all:: $(OBJS)
 
 ETSRCS= gssapi_err_generic.c
-ETOBJS= gssapi_err_generic.o
+ETOBJS= gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
 
-gssapi_err_generic.o: gssapi_err_generic.c
+gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 
 gssapi_err_generic.h: gssapi_err_generic.et
 
@@ -15,10 +20,10 @@ gssapi_err_generic.c: gssapi_err_generic.et
 
 #if HasHashLibrary
 # UTIL_VALIDATE_SRC= $(srcdir)/util_validate.c
-# UTIL_VALIDATE_OBJ= util_validate.o
+# UTIL_VALIDATE_OBJ= util_validate.$(OBJEXT)
 #else
 UTIL_VALIDATE_SRC= $(srcdir)/utl_nohash_validate.c
-UTIL_VALIDATE_OBJ= utl_nohash_validate.o
+UTIL_VALIDATE_OBJ= utl_nohash_validate.$(OBJEXT)
 #endif
 
 CCSRCS = \
@@ -35,31 +40,46 @@ CCSRCS = \
 	$(UTIL_VALIDATE_SRC)
 
 CCOBJS = \
-	disp_major_status.o \
-	disp_com_err_status.o \
-	gssapi_generic.o \
-	rel_buffer.o \
-	rel_oid_set.o \
-	util_buffer.o \
-	util_canonhost.o \
-	util_dup.o \
-	util_oid.o \
-	util_token.o \
+	disp_major_status.$(OBJEXT) \
+	disp_com_err_status.$(OBJEXT) \
+	gssapi_generic.$(OBJEXT) \
+	rel_buffer.$(OBJEXT) \
+	rel_oid_set.$(OBJEXT) \
+	util_buffer.$(OBJEXT) \
+	util_canonhost.$(OBJEXT) \
+	util_dup.$(OBJEXT) \
+	util_oid.$(OBJEXT) \
+	util_token.$(OBJEXT) \
 	$(UTIL_VALIDATE_OBJ)
 
 
-EHDRDIR= $(BUILDTOP)/include/gssapi
+EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi.h gssapi_generic.h
 
 SRCS= $(ETSRCS) $(CCSRCS)
 OBJS= $(ETOBJS) $(CCOBJS)
 HDRS= $(ETHDRS)
 
-all:: $(SRCS) $(HDRS) includes $(OBJS)
+all:: all-$(WHAT) $(SRCS) $(HDRS) includes $(OBJS)
+
+all-unix::
+
+all-windows::
+	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
+	copy gssapi.h $(EHDRDIR)
+	copy gssapi_generic.h $(EHDRDIR)
 
-clean::
+clean:: clean-$(WHAT)
+
+clean-unix::
 	$(RM) $(ETHDRS) $(ETSRCS)
 
+clean-windows::
+	$(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
+	if exist $(EHDRDIR)\nul rmdir $(EHDRDIR)
+
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 
 depend:: $(ETSRCS)
+
+includes::
diff --git a/src/lib/gssapi/generic/disp_com_err_status.c b/src/lib/gssapi/generic/disp_com_err_status.c
index f0e66c3bb..627891275 100644
--- a/src/lib/gssapi/generic/disp_com_err_status.c
+++ b/src/lib/gssapi/generic/disp_com_err_status.c
@@ -40,7 +40,8 @@ static const char * const no_error = "No error";
    if status_type == GSS_C_MECH_CODE, return the output from error_message()
    */
 
-OM_uint32 g_display_com_err_status(minor_status, status_value, status_string)
+OM_uint32 INTERFACE
+g_display_com_err_status(minor_status, status_value, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
      gss_buffer_t status_string;
diff --git a/src/lib/gssapi/generic/disp_major_status.c b/src/lib/gssapi/generic/disp_major_status.c
index 8bbf59538..d37b34e88 100644
--- a/src/lib/gssapi/generic/disp_major_status.c
+++ b/src/lib/gssapi/generic/disp_major_status.c
@@ -201,7 +201,7 @@ static OM_uint32 display_bit(minor_status, code, status_string)
      message_context > 2  : print supplementary info bit (message_context-2)
      */
 
-OM_uint32 g_display_major_status(minor_status, status_value, 
+OM_uint32 INTERFACE g_display_major_status(minor_status, status_value, 
 				 message_context, status_string)
      OM_uint32 *minor_status;
      OM_uint32 status_value;
diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.h
index 29eefdf03..edcef24a7 100644
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.h
@@ -36,7 +36,7 @@
 /*
  * First, define the platform-dependent types.
  */
-typedef unsigned int OM_uint32;
+typedef krb5_ui_4 OM_uint32;
 typedef void * gss_name_t;
 typedef void * gss_cred_id_t;
 typedef void * gss_ctx_id_t;
@@ -232,7 +232,7 @@ typedef struct gss_channel_bindings_struct {
  * Finally, function prototypes for the GSSAPI routines.
  */
 
-OM_uint32 gss_acquire_cred
+OM_uint32 INTERFACE gss_acquire_cred
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
             OM_uint32,        /* time_req */
@@ -243,12 +243,12 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_release_cred
+OM_uint32 INTERFACE gss_release_cred
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
            ));
 
-OM_uint32 gss_init_sec_context
+OM_uint32 INTERFACE gss_init_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
             gss_ctx_id_t*,    /* context_handle */
@@ -265,7 +265,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_accept_sec_context
+OM_uint32 INTERFACE gss_accept_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_cred_id_t,    /* verifier_cred_handle */
@@ -280,25 +280,25 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* delegated_cred_handle */
            ));
 
-OM_uint32 gss_process_context_token
+OM_uint32 INTERFACE gss_process_context_token
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
            ));
 
-OM_uint32 gss_delete_sec_context
+OM_uint32 INTERFACE gss_delete_sec_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
            ));
 
-OM_uint32 gss_context_time
+OM_uint32 INTERFACE gss_context_time
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 gss_sign
+OM_uint32 INTERFACE gss_sign
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* qop_req */
@@ -306,7 +306,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* message_token */
            ));
 
-OM_uint32 gss_verify
+OM_uint32 INTERFACE INTERFACE gss_verify
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* message_buffer */
@@ -314,7 +314,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             int*              /* qop_state */
            ));
 
-OM_uint32 gss_seal
+OM_uint32 INTERFACE gss_seal
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             int,              /* conf_req_flag */
@@ -324,7 +324,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* output_message_buffer */
            ));
 
-OM_uint32 gss_unseal
+OM_uint32 INTERFACE gss_unseal
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t,     /* input_message_buffer */
@@ -333,7 +333,7 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             int*              /* qop_state */
            ));
 
-OM_uint32 gss_display_status
+OM_uint32 INTERFACE gss_display_status
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
             int,              /* status_type */
@@ -342,48 +342,48 @@ PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* status_string */
            ));
 
-OM_uint32 gss_indicate_mechs
+OM_uint32 INTERFACE gss_indicate_mechs
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
            ));
 
-OM_uint32 gss_compare_name
+OM_uint32 INTERFACE gss_compare_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
             gss_name_t,       /* name2 */
             int*              /* name_equal */
            ));
 
-OM_uint32 gss_display_name
+OM_uint32 INTERFACE gss_display_name
 PROTOTYPE( (OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
             gss_buffer_t,     /* output_name_buffer */
             gss_OID*         /* output_name_type */
            ));
 
-OM_uint32 gss_import_name
+OM_uint32 INTERFACE gss_import_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
             const_gss_OID,    /* input_name_type */
             gss_name_t*       /* output_name */
            ));
 
-OM_uint32 gss_release_name
+OM_uint32 INTERFACE gss_release_name
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
            ));
 
-OM_uint32 gss_release_buffer
+OM_uint32 INTERFACE gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 gss_release_oid_set
+OM_uint32 INTERFACE gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
 
-OM_uint32 gss_inquire_cred
+OM_uint32 INTERFACE gss_inquire_cred
 PROTOTYPE( (OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
             gss_name_t *,     /* name */
@@ -392,7 +392,7 @@ PROTOTYPE( (OM_uint32 *,      /* minor_status */
             gss_OID_set *     /* mechanisms */
            ));
 
-OM_uint32 gss_inquire_context
+OM_uint32 INTERFACE gss_inquire_context
 PROTOTYPE( (OM_uint32*,       /* minor_status */
 	    gss_ctx_id_t,     /* context_handle */
 	    gss_name_t*,      /* initiator_name */
diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 08ee040d1..54a25f783 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -28,13 +28,12 @@
 #include "gssapi_err_generic.h"
 #include <errno.h>
 #include <sys/types.h>
-#include <netinet/in.h>
 
 /** helper macros **/
 
 #define g_OID_equal(o1,o2) \
    (((o1)->length == (o2)->length) && \
-    (memcmp((o1)->elements,(o2)->elements,(o1)->length) == 0))
+    (memcmp((o1)->elements,(o2)->elements,(int) (o1)->length) == 0))
 
 /* this code knows that an int on the wire is 32 bits.  The type of
    num should be at least this big, or the extra shifts may do weird
@@ -77,51 +76,51 @@
 
 /** helper functions **/
 
-int g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_save_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_save_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_save_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_validate_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_validate_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_validate_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
-int g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
-int g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
+int INTERFACE g_delete_name PROTOTYPE((void **vdb, gss_name_t *name));
+int INTERFACE g_delete_cred_id PROTOTYPE((void **vdb, gss_cred_id_t *cred));
+int INTERFACE g_delete_ctx_id PROTOTYPE((void **vdb, gss_ctx_id_t *ctx));
 
-int g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
+int INTERFACE g_make_string_buffer PROTOTYPE((const char *str, gss_buffer_t buffer));
 
-int g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
+int INTERFACE g_copy_OID_set PROTOTYPE((const gss_OID_set_desc * const in, gss_OID_set *out));
 
-int g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
+int INTERFACE g_token_size PROTOTYPE((const_gss_OID mech, unsigned int body_size));
 
-void g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
+void INTERFACE g_make_token_header PROTOTYPE((const_gss_OID mech, int body_size,
 			  unsigned char **buf, int tok_type));
 
-int g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
+int INTERFACE g_verify_token_header PROTOTYPE((const_gss_OID mech, int *body_size,
 			  unsigned char **buf, int tok_type, int toksize));
 
-OM_uint32 g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE g_display_major_status PROTOTYPE((OM_uint32 *minor_status,
 				 OM_uint32 status_value,
 				 int *message_context,
 				 gss_buffer_t status_string));
 
-OM_uint32 g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE INTERFACE g_display_com_err_status PROTOTYPE((OM_uint32 *minor_status,
 				   OM_uint32 status_value,
 				   gss_buffer_t status_string));
 
-char *g_canonicalize_host PROTOTYPE((char *hostname));
+char * INTERFACE g_canonicalize_host PROTOTYPE((char *hostname));
 
-char *g_strdup PROTOTYPE((char *str));
+char * INTERFACE g_strdup PROTOTYPE((char *str));
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 generic_gss_release_buffer
+OM_uint32 INTERFACE generic_gss_release_buffer
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_buffer_t      /* buffer */
            ));
 
-OM_uint32 generic_gss_release_oid_set
+OM_uint32 INTERFACE generic_gss_release_oid_set
 PROTOTYPE( (OM_uint32*,       /* minor_status */
             gss_OID_set*      /* set */
            ));
diff --git a/src/lib/gssapi/generic/rel_buffer.c b/src/lib/gssapi/generic/rel_buffer.c
index b764a5b5f..2345fc4b0 100644
--- a/src/lib/gssapi/generic/rel_buffer.c
+++ b/src/lib/gssapi/generic/rel_buffer.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 generic_gss_release_buffer(minor_status, buffer)
+OM_uint32 INTERFACE generic_gss_release_buffer(minor_status, buffer)
      OM_uint32 *minor_status;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/rel_oid_set.c b/src/lib/gssapi/generic/rel_oid_set.c
index 2edfe9a39..073664a19 100644
--- a/src/lib/gssapi/generic/rel_oid_set.c
+++ b/src/lib/gssapi/generic/rel_oid_set.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-OM_uint32 generic_gss_release_oid_set(minor_status, set)
+OM_uint32 INTERFACE generic_gss_release_oid_set(minor_status, set)
      OM_uint32 *minor_status;
      gss_OID_set *set;
 {
diff --git a/src/lib/gssapi/generic/util_buffer.c b/src/lib/gssapi/generic/util_buffer.c
index cf144495f..5fd06721c 100644
--- a/src/lib/gssapi/generic/util_buffer.c
+++ b/src/lib/gssapi/generic/util_buffer.c
@@ -27,7 +27,7 @@
    make sure that buffer is consistent (release'able) when this
    function exits, no matter what the exit value */
 
-int g_make_string_buffer(str, buffer)
+int INTERFACE g_make_string_buffer(str, buffer)
      const char *str;
      gss_buffer_t buffer;
 {
diff --git a/src/lib/gssapi/generic/util_canonhost.c b/src/lib/gssapi/generic/util_canonhost.c
index 694d93354..89de87a02 100644
--- a/src/lib/gssapi/generic/util_canonhost.c
+++ b/src/lib/gssapi/generic/util_canonhost.c
@@ -21,15 +21,15 @@
  */
 
 /* This file could be OS specific */
-
 #include "gssapiP_generic.h"
-
+#ifndef _MSDOS
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <ctype.h>
 
-char *g_canonicalize_host(hostname)
+char * INTERFACE
+g_canonicalize_host(hostname)
      char *hostname;
 {
    struct hostent *hent;
@@ -61,3 +61,4 @@ char *g_canonicalize_host(hostname)
 
    return(canon);
 }
+#endif
diff --git a/src/lib/gssapi/generic/util_dup.c b/src/lib/gssapi/generic/util_dup.c
index 4e48d1704..e3e3e52a6 100644
--- a/src/lib/gssapi/generic/util_dup.c
+++ b/src/lib/gssapi/generic/util_dup.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-char *g_strdup(str)
+char * INTERFACE g_strdup(str)
      char *str;
 {
    char *ret;
diff --git a/src/lib/gssapi/generic/util_oid.c b/src/lib/gssapi/generic/util_oid.c
index c415aad76..8f3d434eb 100644
--- a/src/lib/gssapi/generic/util_oid.c
+++ b/src/lib/gssapi/generic/util_oid.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_generic.h"
 
-int
+int INTERFACE
 g_copy_OID_set(in, out)
      const gss_OID_set_desc * const in;
      gss_OID_set *out;
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 483126c5e..424125d5d 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -111,7 +111,7 @@ static int der_read_length(buf, bufsize)
 
 /* returns the length of a token, given the mech oid and the body size */
 
-int g_token_size(mech, body_size)
+int INTERFACE g_token_size(mech, body_size)
      const_gss_OID mech;
      unsigned int body_size;
 {
@@ -123,7 +123,7 @@ int g_token_size(mech, body_size)
 /* fills in a buffer with the token header.  The buffer is assumed to
    be the right size.  buf is advanced past the token header */
 
-void g_make_token_header(mech, body_size, buf, tok_type)
+void INTERFACE g_make_token_header(mech, body_size, buf, tok_type)
      const_gss_OID mech;
      int body_size;
      unsigned char **buf;
@@ -133,7 +133,7 @@ void g_make_token_header(mech, body_size, buf, tok_type)
    der_write_length(buf, 4 + mech->length + body_size);
    *(*buf)++ = 0x06;
    *(*buf)++ = (unsigned char) mech->length;
-   TWRITE_STR(*buf, mech->elements, mech->length);
+   TWRITE_STR(*buf, mech->elements, ((int) mech->length));
    *(*buf)++ = (unsigned char) ((tok_type>>8)&0xff);
    *(*buf)++ = (unsigned char) (tok_type&0xff);
 }
@@ -142,7 +142,7 @@ void g_make_token_header(mech, body_size, buf, tok_type)
    leaving buf advanced past the token header, and setting body_size
    to the number of remaining bytes */
 
-int g_verify_token_header(mech, body_size, buf, tok_type, toksize)
+int INTERFACE g_verify_token_header(mech, body_size, buf, tok_type, toksize)
      const_gss_OID mech;
      int *body_size;
      unsigned char **buf;
diff --git a/src/lib/gssapi/generic/util_validate.c b/src/lib/gssapi/generic/util_validate.c
index 72631341b..e60ed427b 100644
--- a/src/lib/gssapi/generic/util_validate.c
+++ b/src/lib/gssapi/generic/util_validate.c
@@ -105,45 +105,45 @@ static int g_delete(DB **vdb, int type, void *ptr)
 
 /* save */
 
-int g_save_name(void **vdb, gss_name_t *name)
+int INTERFACE g_save_name(void **vdb, gss_name_t *name)
 {
    return(g_save((DB **) vdb, V_NAME, (void *) name));
 }
-int g_save_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_save_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_save((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_save_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_save((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* validate */
 
-int g_validate_name(void **vdb, gss_name_t *name)
+int INTERFACE g_validate_name(void **vdb, gss_name_t *name)
 {
    return(g_validate((DB **) vdb, V_NAME, (void *) name));
 }
-int g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_validate_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_validate((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_validate_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_validate((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
 
 /* delete */
 
-int g_delete_name(void **vdb, gss_name_t *name)
+int INTERFACE g_delete_name(void **vdb, gss_name_t *name)
 {
    return(g_delete((DB **) vdb, V_NAME, (void *) name));
 }
-int g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
+int INTERFACE g_delete_cred_id(void **vdb, gss_cred_id_t *cred)
 {
    return(g_delete((DB **) vdb, V_CRED_ID, (void *) cred));
 }
-int g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
+int INTERFACE g_delete_ctx_id(void **vdb, gss_ctx_id_t *ctx)
 {
    return(g_delete((DB **) vdb, V_CTX_ID, (void *) ctx));
 }
diff --git a/src/lib/gssapi/generic/utl_nohash_validate.c b/src/lib/gssapi/generic/utl_nohash_validate.c
index d3c4191aa..88ad5937c 100644
--- a/src/lib/gssapi/generic/utl_nohash_validate.c
+++ b/src/lib/gssapi/generic/utl_nohash_validate.c
@@ -27,26 +27,25 @@
 #include "gssapiP_generic.h"
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <limits.h>
 
 /* functions for each type */
 
 /* save */
 
-int g_save_name(vdb, name)
+int INTERFACE g_save_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_save_cred_id(vdb, cred)
+int INTERFACE g_save_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_save_ctx_id(vdb, ctx)
+int INTERFACE g_save_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -55,19 +54,19 @@ int g_save_ctx_id(vdb, ctx)
 
 /* validate */
 
-int g_validate_name(vdb, name)
+int INTERFACE g_validate_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_validate_cred_id(vdb, cred)
+int INTERFACE g_validate_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_validate_ctx_id(vdb, ctx)
+int INTERFACE g_validate_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
@@ -76,19 +75,19 @@ int g_validate_ctx_id(vdb, ctx)
 
 /* delete */
 
-int g_delete_name(vdb, name)
+int INTERFACE g_delete_name(vdb, name)
      void **vdb;
      gss_name_t *name;
 {
 	return 1;
 }
-int g_delete_cred_id(vdb, cred)
+int INTERFACE g_delete_cred_id(vdb, cred)
      void **vdb;
      gss_cred_id_t *cred;
 {
 	return 1;
 }
-int g_delete_ctx_id(vdb, ctx)
+int INTERFACE g_delete_ctx_id(vdb, ctx)
      void **vdb;
      gss_ctx_id_t *ctx;
 {
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 67ac76dcd..f6038d906 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 20 19:53:9 1995 Keith Vetter (keithv@fusion.com)
+
+	* accept_s.c: needed temp to avoid sign/unsigned mismatch on the PC.
+	* init_sec.c: needed temp to avoid sign/unsigned mismatch on the PC.
+        * gssapiP_krb5.h k5seal.c, k5unseal.c: removed netinet/in.h include.
+        * util_seq.c: changed int to 32bit int
+        * gssapiP_krb5.h, gssapi_krb5.h, *.c: added windows INTERFACE keyword
+
 Mon Feb 20 12:00:00 1995  keith Vetter (keithv@fusion.com)
 
 	Rename files for DOS 8.3 uniqueness--files created by Make
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 3a3342b0c..eb3e9a01b 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,13 +1,18 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 LDFLAGS = -g
 
+##DOSBUILDTOP = ..\..\..
+##DOSLIBNAME=..\libgssapi_krb5.$(LIBEXT)
+##DOSsrcdir = .
+##DOS!include $(BUILDTOP)\config\windows.in
+
 all:: $(OBJS)
 
 ETSRCS= gssapi_err_krb5.c
-ETOBJS= gssapi_err_krb5.o
+ETOBJS= gssapi_err_krb5.$(OBJEXT)
 ETHDRS= gssapi_err_krb5.h
 
-gssapi_err_krb5.o: gssapi_err_krb5.c
+gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
 
 gssapi_err_krb5.h: gssapi_err_krb5.et
 
@@ -44,34 +49,34 @@ CCSRCS = \
 	$(srcdir)/verify.c
 
 CCOBJS = \
-	accept_sec_context.o \
-	acquire_cred.o \
-	compare_name.o \
-	context_time.o \
-	delete_sec_context.o \
-	disp_name.o \
-	disp_status.o \
-	get_tkt_flags.o \
-	gssapi_krb5.o \
-	import_name.o \
-	indicate_mechs.o \
-	init_sec_context.o \
-	inq_context.o \
-	inq_cred.o \
-	k5seal.o \
-	k5unseal.o \
-	krb5_gss_glue.o \
-	process_context_token.o \
-	rel_cred.o \
-	rel_name.o \
-	seal.o \
-	sign.o \
-	unseal.o \
-	util_cksum.o \
-	util_crypt.o \
-	util_seed.o \
-	util_seqnum.o \
-	verify.o
+	accept_sec_context.$(OBJEXT) \
+	acquire_cred.$(OBJEXT) \
+	compare_name.$(OBJEXT) \
+	context_time.$(OBJEXT) \
+	delete_sec_context.$(OBJEXT) \
+	disp_name.$(OBJEXT) \
+	disp_status.$(OBJEXT) \
+	get_tkt_flags.$(OBJEXT) \
+	gssapi_krb5.$(OBJEXT) \
+	import_name.$(OBJEXT) \
+	indicate_mechs.$(OBJEXT) \
+	init_sec_context.$(OBJEXT) \
+	inq_context.$(OBJEXT) \
+	inq_cred.$(OBJEXT) \
+	k5seal.$(OBJEXT) \
+	k5unseal.$(OBJEXT) \
+	krb5_gss_glue.$(OBJEXT) \
+	process_context_token.$(OBJEXT) \
+	rel_cred.$(OBJEXT) \
+	rel_name.$(OBJEXT) \
+	seal.$(OBJEXT) \
+	sign.$(OBJEXT) \
+	unseal.$(OBJEXT) \
+	util_cksum.$(OBJEXT) \
+	util_crypt.$(OBJEXT) \
+	util_seed.$(OBJEXT) \
+	util_seqnum.$(OBJEXT) \
+	verify.$(OBJEXT)
 
 SRCS= $(ETSRCS) $(CCSRCS)
 OBJS= $(ETOBJS) $(CCOBJS)
@@ -81,9 +86,13 @@ EHDRDIR=$(TOP)/include/gssapi
 
 all:: $(SRCS) $(HDRS) includes $(OBJS)
 
-clean::
+clean:: clean-$(WHAT)
+
+clean-unix::
 	$(RM) $(ETHDRS) $(ETSRCS)
 
+clean-windows::
+
 depend:: $(ETSRCS)
 
 includes:: 
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 81ef0fa8d..e39445899 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -108,7 +108,7 @@ make_ap_rep(context, authdat, subkey, seq_send, token)
    return(0);
 }
 
-OM_uint32 
+OM_uint32 INTERFACE
 krb5_gss_accept_sec_context(context, minor_status, context_handle, 
 			    verifier_cred_handle, input_token,
 			    input_chan_bindings, src_name, mech_type,
@@ -128,6 +128,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
      gss_cred_id_t *delegated_cred_handle;
 {
    unsigned char *ptr, *ptr2;
+   char *sptr;
    long tmp;
    int bigend;
    krb5_gss_cred_id_t cred;
@@ -197,7 +198,8 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
       return(GSS_S_DEFECTIVE_TOKEN);
    }
 
-   TREAD_STR(ptr, ap_req.data, ap_req.length);
+   sptr = (char *) ptr;
+   TREAD_STR(sptr, ap_req.data, ap_req.length);
 
    /* construct the sender_addr */
 
@@ -229,8 +231,8 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
    /* decode the message */
 
    if (code = krb5_rd_req(context, &ap_req, cred->princ, paddr, NULL, 
-			  &rd_req_keyproc, (krb5_pointer) cred->keytab, 
-			  rcache, &authdat)) {
+			  (krb5_rdreq_key_proc) rd_req_keyproc,
+                          (krb5_pointer) cred->keytab, rcache, &authdat)) {
       (void) krb5_rc_close(context, rcache);
       *minor_status = code;
       return(GSS_S_FAILURE);
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 04db823f6..19025b51b 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -232,7 +232,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred)
 }
    
 /*ARGSUSED*/
-OM_uint32 
+OM_uint32 INTERFACE
 krb5_gss_acquire_cred(context, minor_status, desired_name, time_req,
 		      desired_mechs, cred_usage, output_cred_handle,
 		      actual_mechs, time_rec)
diff --git a/src/lib/gssapi/krb5/compare_name.c b/src/lib/gssapi/krb5/compare_name.c
index 932753600..c81c6c71d 100644
--- a/src/lib/gssapi/krb5/compare_name.c
+++ b/src/lib/gssapi/krb5/compare_name.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_compare_name(context, minor_status, name1, name2, name_equal)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/context_time.c b/src/lib/gssapi/krb5/context_time.c
index 02989ee31..aa76b4f82 100644
--- a/src/lib/gssapi/krb5/context_time.c
+++ b/src/lib/gssapi/krb5/context_time.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_context_time(context, minor_status, context_handle, time_rec)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/delete_sec_context.c b/src/lib/gssapi/krb5/delete_sec_context.c
index 73bd9b05a..cf3ce4193 100644
--- a/src/lib/gssapi/krb5/delete_sec_context.c
+++ b/src/lib/gssapi/krb5/delete_sec_context.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_delete_sec_context(context, minor_status, context_handle, output_token)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/disp_name.c b/src/lib/gssapi/krb5/disp_name.c
index badb61e18..e6047c96e 100644
--- a/src/lib/gssapi/krb5/disp_name.c
+++ b/src/lib/gssapi/krb5/disp_name.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_display_name(context, minor_status, input_name, output_name_buffer, 
 		      output_name_type)
      krb5_context context;
diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index 1cedfe5ce..952df190b 100644
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -31,7 +31,7 @@ static int init_et = 0;
 
 /**/
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_display_status(context, minor_status, status_value, status_type,
 			mech_type, message_context, status_string)
      krb5_context context;
diff --git a/src/lib/gssapi/krb5/get_tkt_flags.c b/src/lib/gssapi/krb5/get_tkt_flags.c
index b04e0c1f2..91360a8af 100644
--- a/src/lib/gssapi/krb5/get_tkt_flags.c
+++ b/src/lib/gssapi/krb5/get_tkt_flags.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 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/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index df4dd047b..86095e714 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -25,7 +25,6 @@
 
 #include <krb5/krb5.h>
 #include <memory.h>
-#include <netinet/in.h>
 
 /* work around sunos braindamage */
 #ifdef major
@@ -114,35 +113,38 @@ extern krb5_context kg_context;
 
 /** helper functions **/
 
-OM_uint32 kg_get_defcred 
+OM_uint32 INTERFACE kg_get_defcred 
 	PROTOTYPE((OM_uint32 *minor_status, 
 		   gss_cred_id_t *cred));
 
-OM_uint32 kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
+OM_uint32 INTERFACE kg_release_defcred PROTOTYPE((OM_uint32 *minor_status));
 
-krb5_error_code kg_checksum_channel_bindings PROTOTYPE((gss_channel_bindings_t cb,
+krb5_error_code INTERFACE kg_checksum_channel_bindings
+         PROTOTYPE((gss_channel_bindings_t cb,
 					     krb5_checksum *cksum,
 					     int bigend));
 
-krb5_error_code kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed, int direction,
-				int seqnum, unsigned char *cksum,
+krb5_error_code INTERFACE kg_make_seq_num PROTOTYPE((krb5_gss_enc_desc *ed,
+            int direction, krb5_int32 seqnum, unsigned char *cksum,
 				unsigned char *buf));
 
-krb5_error_code kg_make_seed PROTOTYPE((krb5_keyblock *key, unsigned char *seed));
+krb5_error_code INTERFACE kg_make_seed PROTOTYPE((krb5_keyblock *key,
+            unsigned char *seed));
 
-int kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed));
+int INTERFACE kg_confounder_size PROTOTYPE((krb5_gss_enc_desc *ed));
 
-krb5_error_code kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed, unsigned char *buf));
+krb5_error_code INTERFACE kg_make_confounder PROTOTYPE((krb5_gss_enc_desc *ed,
+            unsigned char *buf));
 
-int kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n));
+int INTERFACE kg_encrypt_size PROTOTYPE((krb5_gss_enc_desc *ed, int n));
 
-krb5_error_code kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv,
-			   krb5_pointer in, krb5_pointer out, int length));
+krb5_error_code INTERFACE kg_encrypt PROTOTYPE((krb5_gss_enc_desc *ed,
+            krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length));
 
-krb5_error_code kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, krb5_pointer iv,
-			   krb5_pointer in, krb5_pointer out, int length));
+krb5_error_code INTERFACE kg_decrypt PROTOTYPE((krb5_gss_enc_desc *ed, 
+			   krb5_pointer iv, krb5_pointer in, krb5_pointer out, int length));
 
-OM_uint32 kg_seal PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE kg_seal PROTOTYPE((OM_uint32 *minor_status,
 		  gss_ctx_id_t context_handle,
 		  int conf_req_flag,
 		  int qop_req,
@@ -151,7 +153,7 @@ OM_uint32 kg_seal PROTOTYPE((OM_uint32 *minor_status,
 		  gss_buffer_t output_message_buffer,
 		  int toktype));
 
-OM_uint32 kg_unseal PROTOTYPE((OM_uint32 *minor_status,
+OM_uint32 INTERFACE kg_unseal PROTOTYPE((OM_uint32 *minor_status,
 		    gss_ctx_id_t context_handle,
 		    gss_buffer_t input_token_buffer,
 		    gss_buffer_t message_buffer,
@@ -161,7 +163,7 @@ OM_uint32 kg_unseal PROTOTYPE((OM_uint32 *minor_status,
 
 /** declarations of internal name mechanism functions **/
 
-OM_uint32 krb5_gss_acquire_cred
+OM_uint32 INTERFACE krb5_gss_acquire_cred
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_name_t,       /* desired_name */
@@ -173,13 +175,13 @@ PROTOTYPE( (krb5_context,
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 krb5_gss_release_cred
+OM_uint32 INTERFACE krb5_gss_release_cred
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_cred_id_t*    /* cred_handle */
            ));
 
-OM_uint32 krb5_gss_init_sec_context
+OM_uint32 INTERFACE krb5_gss_init_sec_context
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_cred_id_t,    /* claimant_cred_handle */
@@ -197,7 +199,7 @@ PROTOTYPE( (krb5_context,
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 krb5_gss_accept_sec_context
+OM_uint32 INTERFACE krb5_gss_accept_sec_context
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
@@ -213,28 +215,28 @@ PROTOTYPE( (krb5_context,
             gss_cred_id_t*    /* delegated_cred_handle */
            ));
 
-OM_uint32 krb5_gss_process_context_token
+OM_uint32 INTERFACE krb5_gss_process_context_token
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             gss_buffer_t      /* token_buffer */
            ));
 
-OM_uint32 krb5_gss_delete_sec_context
+OM_uint32 INTERFACE krb5_gss_delete_sec_context
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t*,    /* context_handle */
             gss_buffer_t      /* output_token */
            ));
 
-OM_uint32 krb5_gss_context_time
+OM_uint32 INTERFACE krb5_gss_context_time
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
             OM_uint32*        /* time_rec */
            ));
 
-OM_uint32 krb5_gss_sign
+OM_uint32 INTERFACE krb5_gss_sign
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -243,7 +245,7 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* message_token */
            ));
 
-OM_uint32 krb5_gss_verify
+OM_uint32 INTERFACE krb5_gss_verify
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -252,7 +254,7 @@ PROTOTYPE( (krb5_context,
             int*              /* qop_state */
            ));
 
-OM_uint32 krb5_gss_seal
+OM_uint32 INTERFACE krb5_gss_seal
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -263,7 +265,7 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* output_message_buffer */
            ));
 
-OM_uint32 krb5_gss_unseal
+OM_uint32 INTERFACE krb5_gss_unseal
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_ctx_id_t,     /* context_handle */
@@ -273,7 +275,7 @@ PROTOTYPE( (krb5_context,
             int*              /* qop_state */
            ));
 
-OM_uint32 krb5_gss_display_status
+OM_uint32 INTERFACE krb5_gss_display_status
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             OM_uint32,        /* status_value */
@@ -283,13 +285,13 @@ PROTOTYPE( (krb5_context,
             gss_buffer_t      /* status_string */
            ));
 
-OM_uint32 krb5_gss_indicate_mechs
+OM_uint32 INTERFACE krb5_gss_indicate_mechs
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_OID_set*      /* mech_set */
            ));
 
-OM_uint32 krb5_gss_compare_name
+OM_uint32 INTERFACE krb5_gss_compare_name
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_name_t,       /* name1 */
@@ -297,7 +299,7 @@ PROTOTYPE( (krb5_context,
             int*              /* name_equal */
            ));
 
-OM_uint32 krb5_gss_display_name
+OM_uint32 INTERFACE krb5_gss_display_name
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,      /* minor_status */
             gss_name_t,      /* input_name */
@@ -305,7 +307,7 @@ PROTOTYPE( (krb5_context,
             gss_OID*         /* output_name_type */
            ));
 
-OM_uint32 krb5_gss_import_name
+OM_uint32 INTERFACE krb5_gss_import_name
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_buffer_t,     /* input_name_buffer */
@@ -313,13 +315,13 @@ PROTOTYPE( (krb5_context,
             gss_name_t*       /* output_name */
            ));
 
-OM_uint32 krb5_gss_release_name
+OM_uint32 INTERFACE krb5_gss_release_name
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
             gss_name_t*       /* input_name */
            ));
 
-OM_uint32 krb5_gss_inquire_cred
+OM_uint32 INTERFACE krb5_gss_inquire_cred
 PROTOTYPE( (krb5_context,
 	    OM_uint32 *,      /* minor_status */
             gss_cred_id_t,    /* cred_handle */
@@ -329,7 +331,7 @@ PROTOTYPE( (krb5_context,
             gss_OID_set *     /* mechanisms */
            ));
 
-OM_uint32 krb5_gss_inquire_context
+OM_uint32 INTERFACE krb5_gss_inquire_context
 PROTOTYPE( (krb5_context,
 	    OM_uint32*,       /* minor_status */
 	    gss_ctx_id_t,     /* context_handle */
@@ -341,6 +343,6 @@ PROTOTYPE( (krb5_context,
 	    int*              /* locally_initiated */
 	   ));
 
-OM_uint32 kg_get_context();
+OM_uint32 INTERFACE kg_get_context();
 	
 #endif /* _GSSAPIP_KRB5_H_ */
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 4b23217fa..9b318587f 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -73,7 +73,7 @@ static gss_cred_id_t defcred = GSS_C_NO_CREDENTIAL;
 
 /* XXX what happens when the default credentials expire or are invalidated? */
 
-OM_uint32
+OM_uint32 INTERFACE
 kg_get_defcred(minor_status, cred)
      OM_uint32 *minor_status;
      gss_cred_id_t *cred;
@@ -99,7 +99,7 @@ kg_get_defcred(minor_status, cred)
    return(GSS_S_COMPLETE);
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 kg_release_defcred(minor_status)
      OM_uint32 *minor_status;
 {
@@ -114,7 +114,7 @@ kg_release_defcred(minor_status)
    return(krb5_gss_release_cred(kg_context, minor_status, &defcred));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 kg_get_context()
 {
 	if (kg_context)
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index 53f247583..cbbb00f92 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -39,7 +39,7 @@ extern const gss_OID_desc * const gss_nt_krb5_principal;
 #define gss_krb5_nt_machine_uid_name	gss_nt_machine_uid_name
 #define gss_krb5_nt_string_uid_name	gss_nt_string_uid_name
 
-OM_uint32 gss_krb5_get_tkt_flags 
+OM_uint32 INTERFACE gss_krb5_get_tkt_flags 
 	PROTOTYPE((OM_uint32 *minor_status,
 		   gss_ctx_id_t context_handle,
 		   krb5_flags *ticket_flags));
diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index 47417bb66..fbe50cc3e 100644
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -21,6 +21,7 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifndef _MSDOS
 #include <pwd.h>
 #ifdef USE_STRING_H
 #include <string.h>
@@ -35,7 +36,7 @@
  * GSS_S_FAILURE	if memory allocation fails
  */
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_import_name(context, minor_status, input_name_buffer, 
 		     input_name_type, output_name)
      krb5_context context;
@@ -146,3 +147,4 @@ krb5_gss_import_name(context, minor_status, input_name_buffer,
    *output_name = (gss_name_t) princ;
    return(GSS_S_COMPLETE);
 }
+#endif
diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c
index f10087345..11d94131b 100644
--- a/src/lib/gssapi/krb5/indicate_mechs.c
+++ b/src/lib/gssapi/krb5/indicate_mechs.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_indicate_mechs(context, minor_status, mech_set)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 37fa6b218..5b42687d0 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -129,7 +129,7 @@ make_ap_req(context, cred, server, endtime, chan_bindings, do_mutual,
    return(0);
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
 			context_handle, target_name, mech_type,
 			req_flags, time_req, input_chan_bindings,
@@ -337,6 +337,7 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
       }
    } else {
       unsigned char *ptr;
+      char *sptr;
       krb5_data ap_rep;
       krb5_ap_rep_enc_part *ap_rep_data;
 
@@ -387,7 +388,8 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle,
 	 return(GSS_S_DEFECTIVE_TOKEN);
       }
 
-      TREAD_STR(ptr, ap_rep.data, ap_rep.length);
+      sptr = (char *) ptr;                      /* PC compiler bug */
+      TREAD_STR(sptr, ap_rep.data, ap_rep.length);
 
       /* decode the ap_rep */
       if (code = krb5_rd_rep(context, &ap_rep, ctx->subkey, &ap_rep_data)) {
diff --git a/src/lib/gssapi/krb5/inq_context.c b/src/lib/gssapi/krb5/inq_context.c
index 3fd7abefa..b7a8507cc 100644
--- a/src/lib/gssapi/krb5/inq_context.c
+++ b/src/lib/gssapi/krb5/inq_context.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_inquire_context(context, minor_status, context_handle, initiator_name, 
 			 acceptor_name, lifetime_rec, mech_type, ret_flags,
 			 locally_initiated)
diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
index 1101e14cb..7aee2632c 100644
--- a/src/lib/gssapi/krb5/inq_cred.c
+++ b/src/lib/gssapi/krb5/inq_cred.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_inquire_cred(context, minor_status, cred_handle, name, lifetime_ret,
 		      cred_usage, mechanisms)
      krb5_context context;
diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index da431f1e2..d475b010a 100644
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -21,7 +21,6 @@
  */
 
 #include "gssapiP_krb5.h"
-#include <netinet/in.h>
 #include <krb5/rsa-md5.h>
 
 static krb5_error_code
@@ -180,7 +179,7 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token,
 /* if signonly is true, ignore conf_req, conf_state, 
    and do not encode the ENC_TYPE, MSG_LENGTH, or MSG_TEXT fields */
 
-OM_uint32
+OM_uint32 INTERFACE
 kg_seal(minor_status, context_handle, conf_req_flag, qop_req, 
 	input_message_buffer, conf_state, output_message_buffer, toktype)
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index ca0eca182..ce0bde524 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -22,14 +22,13 @@
 
 #include "gssapiP_krb5.h"
 #include <memory.h>
-#include <netinet/in.h>
 #include <krb5/rsa-md5.h>
 
 /* message_buffer is an input if SIGN, output if SEAL, and ignored if DEL_CTX
    conf_state is only valid if SEAL.
    */
 
-OM_uint32
+OM_uint32 INTERFACE
 kg_unseal(minor_status, context_handle, input_token_buffer, message_buffer,
 	  conf_state, qop_state, toktype)
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index c8907e1bc..a449b79d8 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 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)
@@ -64,7 +64,7 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
 				      delegated_cred_handle));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 		 cred_usage, output_cred_handle, actual_mechs, time_rec)
      OM_uint32 *minor_status;
@@ -89,7 +89,7 @@ gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
 				time_rec));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_compare_name(minor_status, name1, name2, name_equal)
      OM_uint32 *minor_status;
      gss_name_t name1;
@@ -103,7 +103,7 @@ gss_compare_name(minor_status, name1, name2, name_equal)
 				name2, name_equal));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_context_time(minor_status, context_handle, time_rec)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
@@ -123,7 +123,7 @@ gss_context_time(minor_status, context_handle, time_rec)
 				time_rec));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_delete_sec_context(minor_status, context_handle, output_token)
      OM_uint32 *minor_status;
      gss_ctx_id_t *context_handle;
@@ -143,7 +143,7 @@ gss_delete_sec_context(minor_status, context_handle, output_token)
 				      context_handle, output_token));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
      OM_uint32 *minor_status;
      gss_name_t input_name;
@@ -157,7 +157,7 @@ gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
 				output_name_buffer, output_name_type));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_display_status(minor_status, status_value, status_type,
 		   mech_type, message_context, status_string)
      OM_uint32 *minor_status;
@@ -175,7 +175,7 @@ gss_display_status(minor_status, status_value, status_type,
 				  status_string));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
      OM_uint32 *minor_status;
      gss_buffer_t input_name_buffer;
@@ -189,7 +189,7 @@ gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
 			       input_name_type, output_name));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_indicate_mechs(minor_status, mech_set)
      OM_uint32 *minor_status;
      gss_OID_set *mech_set;
@@ -200,7 +200,7 @@ gss_indicate_mechs(minor_status, mech_set)
    return(krb5_gss_indicate_mechs(kg_context, minor_status, mech_set));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 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,
@@ -230,7 +230,7 @@ gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
 				    time_rec));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 		    lifetime_rec, mech_type, ret_flags,
 		    locally_initiated)
@@ -258,7 +258,7 @@ gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
 				   mech_type, ret_flags, locally_initiated));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 		 cred_usage, mechanisms)
      OM_uint32 *minor_status;
@@ -275,7 +275,7 @@ gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
 				name, lifetime_ret, cred_usage, mechanisms));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_process_context_token(minor_status, context_handle, token_buffer)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
@@ -295,7 +295,7 @@ gss_process_context_token(minor_status, context_handle, token_buffer)
 					 context_handle, token_buffer));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_release_cred(minor_status, cred_handle)
      OM_uint32 *minor_status;
      gss_cred_id_t *cred_handle;
@@ -306,7 +306,7 @@ gss_release_cred(minor_status, cred_handle)
    return(krb5_gss_release_cred(kg_context, minor_status, cred_handle));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_release_name(minor_status, input_name)
      OM_uint32 *minor_status;
      gss_name_t *input_name;
@@ -317,7 +317,7 @@ gss_release_name(minor_status, input_name)
    return(krb5_gss_release_name(kg_context, minor_status, input_name));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_release_buffer(minor_status, buffer)
      OM_uint32 *minor_status;
      gss_buffer_t buffer;
@@ -326,7 +326,7 @@ gss_release_buffer(minor_status, buffer)
 				     buffer));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_release_oid_set(minor_status, set)
      OM_uint32* minor_status;
      gss_OID_set *set;
@@ -334,7 +334,7 @@ gss_release_oid_set(minor_status, set)
    return(generic_gss_release_oid_set(minor_status, set));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 	 input_message_buffer, conf_state, output_message_buffer)
      OM_uint32 *minor_status;
@@ -360,7 +360,7 @@ gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
 			conf_state, output_message_buffer));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_sign(minor_status, context_handle, qop_req, message_buffer, message_token)
      OM_uint32 *minor_status;
      gss_ctx_id_t context_handle;
@@ -382,7 +382,7 @@ gss_sign(minor_status, context_handle, qop_req, message_buffer, message_token)
 			qop_req, message_buffer, message_token));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_unseal(minor_status, context_handle, input_message_buffer,
 	   output_message_buffer, conf_state, qop_state)
      OM_uint32 *minor_status;
@@ -407,7 +407,7 @@ gss_unseal(minor_status, context_handle, input_message_buffer,
 			  conf_state, qop_state));
 }
 
-OM_uint32
+OM_uint32 INTERFACE
 gss_verify(minor_status, context_handle, message_buffer,
 	   token_buffer, qop_state)
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/process_context_token.c b/src/lib/gssapi/krb5/process_context_token.c
index 5a7a65215..3a6d404f0 100644
--- a/src/lib/gssapi/krb5/process_context_token.c
+++ b/src/lib/gssapi/krb5/process_context_token.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_process_context_token(context, minor_status, context_handle, 
 			       token_buffer)
      krb5_context context;
diff --git a/src/lib/gssapi/krb5/rel_cred.c b/src/lib/gssapi/krb5/rel_cred.c
index 21cfc5fba..28f1ff7b4 100644
--- a/src/lib/gssapi/krb5/rel_cred.c
+++ b/src/lib/gssapi/krb5/rel_cred.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE 
 krb5_gss_release_cred(context, minor_status, cred_handle)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/rel_name.c b/src/lib/gssapi/krb5/rel_name.c
index 4756d08bd..fd0a88ebc 100644
--- a/src/lib/gssapi/krb5/rel_name.c
+++ b/src/lib/gssapi/krb5/rel_name.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_release_name(context, minor_status, input_name)
      krb5_context context;
      OM_uint32 *minor_status;
diff --git a/src/lib/gssapi/krb5/seal.c b/src/lib/gssapi/krb5/seal.c
index a0e06ebde..645b3d638 100644
--- a/src/lib/gssapi/krb5/seal.c
+++ b/src/lib/gssapi/krb5/seal.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_seal(context, minor_status, context_handle, conf_req_flag,
 	      qop_req, input_message_buffer, conf_state,
 	      output_message_buffer)
diff --git a/src/lib/gssapi/krb5/sign.c b/src/lib/gssapi/krb5/sign.c
index bafc0837d..368d7f81d 100644
--- a/src/lib/gssapi/krb5/sign.c
+++ b/src/lib/gssapi/krb5/sign.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_sign(context, minor_status, context_handle,
 	      qop_req, message_buffer, 
 	      message_token)
diff --git a/src/lib/gssapi/krb5/unseal.c b/src/lib/gssapi/krb5/unseal.c
index 3449951af..f7aa994b1 100644
--- a/src/lib/gssapi/krb5/unseal.c
+++ b/src/lib/gssapi/krb5/unseal.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_unseal(context, minor_status, context_handle,
 		input_message_buffer, output_message_buffer,
 		conf_state, qop_state)
diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c
index df95d8349..c17d2f5bb 100644
--- a/src/lib/gssapi/krb5/util_cksum.c
+++ b/src/lib/gssapi/krb5/util_cksum.c
@@ -23,7 +23,7 @@
 #include "gssapiP_krb5.h"
 #include <memory.h>
 
-krb5_error_code 
+krb5_error_code INTERFACE
 kg_checksum_channel_bindings(cb, cksum, bigend)
      gss_channel_bindings_t cb;
      krb5_checksum *cksum;
diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
index 3b954e9e2..fcb4306ad 100644
--- a/src/lib/gssapi/krb5/util_crypt.c
+++ b/src/lib/gssapi/krb5/util_crypt.c
@@ -25,7 +25,8 @@
 
 static unsigned char zeros[8] = {0,0,0,0,0,0,0,0};
 
-int kg_confounder_size(ed)
+int INTERFACE
+kg_confounder_size(ed)
      krb5_gss_enc_desc *ed;
 {
    /* XXX Is this an abstraction violation? */
@@ -33,7 +34,7 @@ int kg_confounder_size(ed)
    return(ed->eblock.crypto_entry->block_length);
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 kg_make_confounder(ed, buf)
      krb5_gss_enc_desc *ed;
      unsigned char *buf;
@@ -43,14 +44,15 @@ kg_make_confounder(ed, buf)
    return(krb5_random_confounder( ed->eblock.crypto_entry->block_length, buf));
 }
 
-int kg_encrypt_size(ed, n)
+int INTERFACE
+kg_encrypt_size(ed, n)
      krb5_gss_enc_desc *ed;
      int n;
 {
    return(krb5_encrypt_size(n, ed->eblock.crypto_entry));
 }
 
-krb5_error_code
+krb5_error_code INTERFACE
 kg_encrypt(ed, iv, in, out, length)
      krb5_gss_enc_desc *ed;
      krb5_pointer iv;
@@ -78,7 +80,7 @@ kg_encrypt(ed, iv, in, out, length)
 
 /* length is the length of the cleartext. */
 
-krb5_error_code
+krb5_error_code INTERFACE
 kg_decrypt(ed, iv, in, out, length)
      krb5_gss_enc_desc *ed;
      krb5_pointer iv;
diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
index 8792b8bd9..318a49b8c 100644
--- a/src/lib/gssapi/krb5/util_seed.c
+++ b/src/lib/gssapi/krb5/util_seed.c
@@ -25,7 +25,7 @@
 
 static unsigned char zeros[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0};
 
-krb5_error_code
+krb5_error_code INTERFACE
 kg_make_seed(key, seed)
      krb5_keyblock *key;
      unsigned char *seed;
diff --git a/src/lib/gssapi/krb5/util_seqnum.c b/src/lib/gssapi/krb5/util_seqnum.c
index 47381f682..a6d6ed597 100644
--- a/src/lib/gssapi/krb5/util_seqnum.c
+++ b/src/lib/gssapi/krb5/util_seqnum.c
@@ -22,11 +22,11 @@
 
 #include "gssapiP_krb5.h"
 
-krb5_error_code 
+krb5_error_code INTERFACE
 kg_make_seq_num(ed, direction, seqnum, cksum, buf)
      krb5_gss_enc_desc *ed;
      int direction;
-     int seqnum;
+     krb5_int32 seqnum;
      unsigned char *cksum;
      unsigned char *buf;
 {
diff --git a/src/lib/gssapi/krb5/verify.c b/src/lib/gssapi/krb5/verify.c
index 398b1d771..df0316aa8 100644
--- a/src/lib/gssapi/krb5/verify.c
+++ b/src/lib/gssapi/krb5/verify.c
@@ -22,7 +22,7 @@
 
 #include "gssapiP_krb5.h"
 
-OM_uint32
+OM_uint32 INTERFACE
 krb5_gss_verify(context, minor_status, context_handle,
 		message_buffer, token_buffer,
 		qop_state)