Windows/NT integration (V1_0_WIN32_BRANCH merge)

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

37 files changed, 105 insertions, 65 deletions

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 56cea9297..f2b4d65d9 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,7 +1,15 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* ccbase.c, ccdefault.c:
+	DLL export basic ccache functions
+
 Thu Jun  6 00:04:38 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (all-windows): Don't pass $(LIBCMD) on the command
-		line.  It's set in the windows.in prologue for all Makefiles anyway.
+		line.  It's set in the windows.in prologue for all
+		Makefiles anyway.
 
 Wed Feb  7 00:23:18 1996  Theodore Y. Ts'o  <tytso@dcl>
 
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index c95b6f7a9..5661182c5 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio
 
 ##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=..\krb5.lib
+##DOSMYNAME=ccache
+##DOSOBJFILE=..\$(MYNAME).lst
+##WIN16##LIBNAME=..\krb5.lib
 
 MAC_SUBDIRS = file stdio
 
@@ -22,11 +24,19 @@ SRCS=	$(srcdir)/ccbase.c \
 all-unix:: shared $(OBJS) 
 
 all-mac:: $(OBJS) 
-all-windows:: $(OBJS) 
-	cd FILE
-	@echo Making in ccache\file
-	-$(MAKE) -$(MFLAGS)
-	cd ..
+all-windows:: subdirs $(OBJFILE) 
+
+##DOSsubdirs:: file\file.lst
+##DOSfile\file.lst::
+##DOS	cd file
+##DOS	@echo Making in krb5\ccache\file
+##DOS	-$(MAKE) -$(MFLAGS)
+##DOS	cd ..
+
+##DOS$(OBJFILE): $(OBJS) file\file.lst
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj file\*.obj > $(OBJFILE)
 
 shared: 
 	mkdir shared
@@ -36,8 +46,9 @@ clean-unix::
 
 clean-mac:
 clean-windows::
-	cd FILE
-	@echo Making clean in ccache\file
+	cd file
+	@echo Making clean in krb5\ccache\file
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
-	@echo Making clean locally
+	@echo Making clean in krb5\ccache
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 05a18d0df..e8bff024d 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -26,7 +26,6 @@
 
 #include "k5-int.h"
 
-extern krb5_cc_ops *krb5_cc_dfl_ops;
 struct krb5_cc_typelist
  {
   krb5_cc_ops *ops;
@@ -39,10 +38,10 @@ static struct krb5_cc_typelist *cc_typehead = 0;
  * If override is set, replace any existing ccache with that type tag
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_register(context, ops, override)
    krb5_context context;
-   krb5_cc_ops *ops;
+   krb5_cc_ops FAR *ops;
    krb5_boolean override;
 {
     struct krb5_cc_typelist *t;
@@ -73,7 +72,7 @@ krb5_cc_register(context, ops, override)
  * particular cache type.
  */
 
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_resolve (context, name, cache)
    krb5_context context;
    char *name;
diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index c5b8f4c73..5e3cd53a9 100644
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -26,10 +26,10 @@
 
 #include "k5-int.h"
 
-krb5_error_code INTERFACE
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_cc_default(context, ccache)
    krb5_context context;
-   krb5_ccache *ccache;
+   krb5_ccache FAR *ccache;
 {
     return krb5_cc_resolve(context, krb5_cc_default_name(context), ccache);
 }
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 8b568c178..43f4a7038 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,16 @@
+Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
+
+        * Makefile.in: win32 build
+
+	* configure.in: Test for chmod and fchmod (not on Windows)
+
+	* fcc-proto.h, fcc_close.c, fcc_destry.c, fcc_eseq.c, fcc_gennew.c,
+	fcc_getnam.c, fcc_gprin.c, fcc_init.c, fcc_nseq.c, fcc_ops.c,
+	fcc_reslv.c, fcc_retrv.c, fcc_sflags.c, fcc_sseq.c, fcc_store.c:
+		Changed the calling conventions of the internal ccache
+		functions to comply with the new function calling
+		conventions of the ccache dispatch functions (win16/win32)
+
 Thu Aug 15 16:46:00 1996  Tom Yu  <tlyu@mit.edu>
 
 	* fcc_retrv.c (flags_match): Add parens to def'n of flags_match to
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 48805c3c1..1c1c24677 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
-##DOSLIBNAME=..\..\krb5.lib
+##DOSMYNAME = ccache\file
+##DOSOBJFILE = file.lst
+##WIN16##LIBNAME=..\..\krb5.lib
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -25,7 +27,12 @@ SRCS 	= $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \
 
 all-unix:: shared $(OBJS)
 all-mac:: $(OBJS)
-all-windows:: $(OBJS)
+all-windows:: $(OBJFILE)
+
+##DOS$(OBJFILE): $(OBJS)
+##DOS	$(RM) $(OBJFILE)
+##WIN16##	$(CP) nul: $(OBJFILE)
+##WIN32##	$(LIBECHO) -p $(MYNAME)\ *.obj > $(OBJFILE)
 
 shared: 
 	mkdir shared
@@ -35,3 +42,4 @@ clean-unix::
 
 clean-mac::
 clean-windows::
+	$(RM) $(OBJFILE)
diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in
index ee042a115..72b51d7a1 100644
--- a/src/lib/krb5/ccache/file/configure.in
+++ b/src/lib/krb5/ccache/file/configure.in
@@ -2,6 +2,7 @@ AC_INIT(configure.in)
 CONFIG_RULES
 AC_HAVE_HEADERS(unistd.h)
 AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK))
+AC_HAVE_FUNCS(fchmod chmod)
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h
index 7e8f7c158..61b5cf3c1 100644
--- a/src/lib/krb5/ccache/file/fcc-proto.h
+++ b/src/lib/krb5/ccache/file/fcc-proto.h
@@ -127,7 +127,7 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags
         KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
 
 /* fcc_ops.c */
-extern krb5_cc_ops krb5_cc_file_ops;
+KRB5_DLLIMP extern krb5_cc_ops krb5_cc_file_ops;
 krb5_error_code krb5_change_cache
    KRB5_PROTOTYPE((void));
 
diff --git a/src/lib/krb5/ccache/file/fcc_close.c b/src/lib/krb5/ccache/file/fcc_close.c
index 71e52f549..6e7997afd 100644
--- a/src/lib/krb5/ccache/file/fcc_close.c
+++ b/src/lib/krb5/ccache/file/fcc_close.c
@@ -35,7 +35,7 @@
  * Closes the file cache, invalidates the id, and frees any resources
  * associated with the cache.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_close(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c
index 02deb7293..37914e1f9 100644
--- a/src/lib/krb5/ccache/file/fcc_destry.c
+++ b/src/lib/krb5/ccache/file/fcc_destry.c
@@ -34,7 +34,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_destroy(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_eseq.c b/src/lib/krb5/ccache/file/fcc_eseq.c
index 369d667a6..d6ce34e2d 100644
--- a/src/lib/krb5/ccache/file/fcc_eseq.c
+++ b/src/lib/krb5/ccache/file/fcc_eseq.c
@@ -40,7 +40,7 @@
  * and invalidates the cursor (it must never be used after this call).
  */
 /* ARGSUSED */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_end_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index 177e0e960..a76a19277 100644
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -53,7 +53,7 @@ extern krb5_cc_ops krb5_fcc_ops;
  * 		krb5_ccache.  id is undefined.
  * system errors (from open)
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_generate_new (context, id)
    krb5_context context;
    krb5_ccache *id;
@@ -111,8 +111,8 @@ krb5_fcc_generate_new (context, id)
 	  int errsave, cnt;
 
 	  /* Ignore user's umask, set mode = 0600 */
-#ifdef NOFCHMOD
-#ifndef NOCHMOD
+#ifndef HAVE_FCHMOD
+#ifdef HAVE_CHMOD
 	  chmod(((krb5_fcc_data *) lid->data)->filename, S_IRUSR | S_IWUSR);
 #endif
 #else
diff --git a/src/lib/krb5/ccache/file/fcc_getnam.c b/src/lib/krb5/ccache/file/fcc_getnam.c
index 514535957..6a7b9557c 100644
--- a/src/lib/krb5/ccache/file/fcc_getnam.c
+++ b/src/lib/krb5/ccache/file/fcc_getnam.c
@@ -35,7 +35,7 @@
  * Returns:
  * The name of the file cred cache id.
  */
-KRB5_DLLIMP char * KRB5_CALLCONV
+char * KRB5_CALLCONV
 krb5_fcc_get_name (context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_gprin.c b/src/lib/krb5/ccache/file/fcc_gprin.c
index 97369db01..72d6c7780 100644
--- a/src/lib/krb5/ccache/file/fcc_gprin.c
+++ b/src/lib/krb5/ccache/file/fcc_gprin.c
@@ -40,7 +40,7 @@
  * system errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_get_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_init.c b/src/lib/krb5/ccache/file/fcc_init.c
index 8f661bab3..b3bf74de1 100644
--- a/src/lib/krb5/ccache/file/fcc_init.c
+++ b/src/lib/krb5/ccache/file/fcc_init.c
@@ -40,7 +40,7 @@
  * system errors
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_initialize(context, id, princ)
    krb5_context context;
    krb5_ccache id;
@@ -51,8 +51,8 @@ krb5_fcc_initialize(context, id, princ)
 
      MAYBE_OPEN(context, id, FCC_OPEN_AND_ERASE);
 
-#ifdef NOFCHMOD
-#ifndef NOCHMOD
+#ifndef HAVE_FCHMOD
+#ifdef HAVE_CHMOD
      reti = chmod(((krb5_fcc_data *) id->data)->filename, S_IREAD | S_IWRITE);
 #endif
 #else
diff --git a/src/lib/krb5/ccache/file/fcc_nseq.c b/src/lib/krb5/ccache/file/fcc_nseq.c
index 96650ac45..92df32927 100644
--- a/src/lib/krb5/ccache/file/fcc_nseq.c
+++ b/src/lib/krb5/ccache/file/fcc_nseq.c
@@ -48,7 +48,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_next_cred(context, id, cursor, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_ops.c b/src/lib/krb5/ccache/file/fcc_ops.c
index c9ff93978..e873bed0b 100644
--- a/src/lib/krb5/ccache/file/fcc_ops.c
+++ b/src/lib/krb5/ccache/file/fcc_ops.c
@@ -64,7 +64,7 @@ krb5_change_cache (void) {
     return 0;
 }
 
-unsigned int INTERFACE
+KRB5_DLLIMP unsigned int KRB5_CALLCONV
 krb5_get_notification_message (void) {
     static unsigned int message = 0;
 
@@ -80,7 +80,7 @@ krb5_change_cache ()
 {
     return 0;
 }
-unsigned int INTERFACE
+unsigned int
 krb5_get_notification_message ()
 {
     return 0;
diff --git a/src/lib/krb5/ccache/file/fcc_reslv.c b/src/lib/krb5/ccache/file/fcc_reslv.c
index 4b6d381c9..8ba7d78b0 100644
--- a/src/lib/krb5/ccache/file/fcc_reslv.c
+++ b/src/lib/krb5/ccache/file/fcc_reslv.c
@@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_fcc_ops;
  * 		krb5_ccache.  id is undefined.
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_resolve (context, id, residual)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/file/fcc_retrv.c b/src/lib/krb5/ccache/file/fcc_retrv.c
index ab0db7c8e..e12d06e58 100644
--- a/src/lib/krb5/ccache/file/fcc_retrv.c
+++ b/src/lib/krb5/ccache/file/fcc_retrv.c
@@ -90,7 +90,7 @@ register const krb5_data *data1, *data2;
  * permission errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_retrieve(context, id, whichfields, mcreds, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_sflags.c b/src/lib/krb5/ccache/file/fcc_sflags.c
index d74f2b0e8..9f9b60140 100644
--- a/src/lib/krb5/ccache/file/fcc_sflags.c
+++ b/src/lib/krb5/ccache/file/fcc_sflags.c
@@ -39,7 +39,7 @@
  * Effects:
  * Sets the operational flags of id to flags.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_set_flags(context, id, flags)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_sseq.c b/src/lib/krb5/ccache/file/fcc_sseq.c
index dac38941c..8e215becd 100644
--- a/src/lib/krb5/ccache/file/fcc_sseq.c
+++ b/src/lib/krb5/ccache/file/fcc_sseq.c
@@ -40,7 +40,7 @@
  * KRB5_CC_NOMEM
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_start_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/file/fcc_store.c b/src/lib/krb5/ccache/file/fcc_store.c
index fec27aeb6..4915e4e39 100644
--- a/src/lib/krb5/ccache/file/fcc_store.c
+++ b/src/lib/krb5/ccache/file/fcc_store.c
@@ -41,7 +41,7 @@
  * system errors
  * storage failure errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_fcc_store(context, id, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc-proto.h b/src/lib/krb5/ccache/memory/mcc-proto.h
index 6cc83f9af..d41ad4952 100644
--- a/src/lib/krb5/ccache/memory/mcc-proto.h
+++ b/src/lib/krb5/ccache/memory/mcc-proto.h
@@ -29,46 +29,46 @@
 #define KRB5_MCC_PROTO__
 
 /* mcc_close.c */
-krb5_error_code INTERFACE krb5_mcc_close
+krb5_error_code KRB5_CALLCONV krb5_mcc_close
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_destry.c */
-krb5_error_code INTERFACE krb5_mcc_destroy 
+krb5_error_code KRB5_CALLCONV krb5_mcc_destroy 
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_eseq.c */
-krb5_error_code INTERFACE krb5_mcc_end_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
 
 /* mcc_gennew.c */
-krb5_error_code INTERFACE krb5_mcc_generate_new 
+krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new 
 	PROTOTYPE((krb5_context, krb5_ccache *id ));
 
 /* mcc_getnam.c */
-char * INTERFACE krb5_mcc_get_name 
+char * KRB5_CALLCONV krb5_mcc_get_name 
 	PROTOTYPE((krb5_context, krb5_ccache id ));
 
 /* mcc_gprin.c */
-krb5_error_code INTERFACE krb5_mcc_get_principal 
+krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ ));
 
 /* mcc_init.c */
-krb5_error_code INTERFACE krb5_mcc_initialize 
+krb5_error_code KRB5_CALLCONV krb5_mcc_initialize 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ ));
 
 /* mcc_nseq.c */
-krb5_error_code INTERFACE krb5_mcc_next_cred 
+krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred 
 	PROTOTYPE((krb5_context, 
 		   krb5_ccache id , 
 		   krb5_cc_cursor *cursor , 
 		   krb5_creds *creds ));
 
 /* mcc_reslv.c */
-krb5_error_code INTERFACE krb5_mcc_resolve 
+krb5_error_code KRB5_CALLCONV krb5_mcc_resolve 
 	PROTOTYPE((krb5_context, krb5_ccache *id , char *residual ));
 
 /* mcc_retrv.c */
-krb5_error_code INTERFACE krb5_mcc_retrieve 
+krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve 
 	PROTOTYPE((krb5_context, 
 		   krb5_ccache id , 
 		   krb5_flags whichfields , 
@@ -76,15 +76,15 @@ krb5_error_code INTERFACE krb5_mcc_retrieve
 		   krb5_creds *creds ));
 
 /* mcc_sseq.c */
-krb5_error_code INTERFACE krb5_mcc_start_seq_get 
+krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ));
 
 /* mcc_store.c */
-krb5_error_code INTERFACE krb5_mcc_store 
+krb5_error_code KRB5_CALLCONV krb5_mcc_store 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds ));
 
 /* mcc_sflags.c */
-krb5_error_code INTERFACE krb5_mcc_set_flags 
+krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags 
 	PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags ));
 
 /* mcc_ops.c */
diff --git a/src/lib/krb5/ccache/memory/mcc_close.c b/src/lib/krb5/ccache/memory/mcc_close.c
index b40a9b360..514a4adfa 100644
--- a/src/lib/krb5/ccache/memory/mcc_close.c
+++ b/src/lib/krb5/ccache/memory/mcc_close.c
@@ -35,7 +35,7 @@
  * Closes the file cache, invalidates the id, and frees any resources
  * associated with the cache.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_close(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_destry.c b/src/lib/krb5/ccache/memory/mcc_destry.c
index 0c050523d..e6946789d 100644
--- a/src/lib/krb5/ccache/memory/mcc_destry.c
+++ b/src/lib/krb5/ccache/memory/mcc_destry.c
@@ -52,7 +52,7 @@ krb5_mcc_free(context, id)
  * Errors:
  * none
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_destroy(context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_eseq.c b/src/lib/krb5/ccache/memory/mcc_eseq.c
index 907951b85..c3d264cdd 100644
--- a/src/lib/krb5/ccache/memory/mcc_eseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_eseq.c
@@ -40,7 +40,7 @@
  * and invalidates the cursor (it must never be used after this call).
  */
 /* ARGSUSED */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_end_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_gennew.c b/src/lib/krb5/ccache/memory/mcc_gennew.c
index 0e7dfa56f..76249610a 100644
--- a/src/lib/krb5/ccache/memory/mcc_gennew.c
+++ b/src/lib/krb5/ccache/memory/mcc_gennew.c
@@ -43,7 +43,7 @@ extern krb5_cc_ops krb5_mcc_ops;
  *              krb5_ccache.  id is undefined.
  * system errors (from open)
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_generate_new (context, id)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/memory/mcc_getnam.c b/src/lib/krb5/ccache/memory/mcc_getnam.c
index fdfcaa84c..e86b0836e 100644
--- a/src/lib/krb5/ccache/memory/mcc_getnam.c
+++ b/src/lib/krb5/ccache/memory/mcc_getnam.c
@@ -35,7 +35,7 @@
  * Returns:
  * The name of the file cred cache id.
  */
-char * INTERFACE
+char * KRB5_CALLCONV
 krb5_mcc_get_name (context, id)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_gprin.c b/src/lib/krb5/ccache/memory/mcc_gprin.c
index 2cc55d32d..81624d73a 100644
--- a/src/lib/krb5/ccache/memory/mcc_gprin.c
+++ b/src/lib/krb5/ccache/memory/mcc_gprin.c
@@ -40,7 +40,7 @@
  * system errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_get_principal(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_init.c b/src/lib/krb5/ccache/memory/mcc_init.c
index 8aac3f16a..5f4a40ae7 100644
--- a/src/lib/krb5/ccache/memory/mcc_init.c
+++ b/src/lib/krb5/ccache/memory/mcc_init.c
@@ -40,7 +40,7 @@
  */
 void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id));
 
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_initialize(context, id, princ)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_nseq.c b/src/lib/krb5/ccache/memory/mcc_nseq.c
index 30ecdba7e..a68b9f95a 100644
--- a/src/lib/krb5/ccache/memory/mcc_nseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_nseq.c
@@ -46,7 +46,7 @@
  * Errors:
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_next_cred(context, id, cursor, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_reslv.c b/src/lib/krb5/ccache/memory/mcc_reslv.c
index 6146c6c2b..a2468d8d0 100644
--- a/src/lib/krb5/ccache/memory/mcc_reslv.c
+++ b/src/lib/krb5/ccache/memory/mcc_reslv.c
@@ -49,7 +49,7 @@ extern krb5_cc_ops krb5_mcc_ops;
  *              krb5_ccache.  id is undefined.
  * permission errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_resolve (context, id, residual)
    krb5_context context;
    krb5_ccache *id;
diff --git a/src/lib/krb5/ccache/memory/mcc_retrv.c b/src/lib/krb5/ccache/memory/mcc_retrv.c
index bb07171b4..ae3510129 100644
--- a/src/lib/krb5/ccache/memory/mcc_retrv.c
+++ b/src/lib/krb5/ccache/memory/mcc_retrv.c
@@ -86,7 +86,7 @@ register const krb5_data *data1, *data2;
  * permission errors
  * KRB5_CC_NOMEM
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_retrieve(context, id, whichfields, mcreds, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_sflags.c b/src/lib/krb5/ccache/memory/mcc_sflags.c
index 1484ab8b1..a12c696f9 100644
--- a/src/lib/krb5/ccache/memory/mcc_sflags.c
+++ b/src/lib/krb5/ccache/memory/mcc_sflags.c
@@ -39,7 +39,7 @@
  * Effects:
  * Sets the operational flags of id to flags.
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_set_flags(context, id, flags)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_sseq.c b/src/lib/krb5/ccache/memory/mcc_sseq.c
index 5954de3d6..bb87e47df 100644
--- a/src/lib/krb5/ccache/memory/mcc_sseq.c
+++ b/src/lib/krb5/ccache/memory/mcc_sseq.c
@@ -40,7 +40,7 @@
  * KRB5_CC_NOMEM
  * system errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_start_seq_get(context, id, cursor)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/memory/mcc_store.c b/src/lib/krb5/ccache/memory/mcc_store.c
index 8b2e22dfa..91a433f60 100644
--- a/src/lib/krb5/ccache/memory/mcc_store.c
+++ b/src/lib/krb5/ccache/memory/mcc_store.c
@@ -23,7 +23,7 @@
  * system errors
  * storage failure errors
  */
-krb5_error_code INTERFACE
+krb5_error_code KRB5_CALLCONV
 krb5_mcc_store(context, id, creds)
    krb5_context context;
    krb5_ccache id;
diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c
index 384e8ebb2..c834769eb 100644
--- a/src/lib/krb5/ccache/ser_cc.c
+++ b/src/lib/krb5/ccache/ser_cc.c
@@ -203,7 +203,7 @@ krb5_ccache_internalize(kcontext, argp, buffer, lenremain)
 /*
  * Register the ccache serializer.
  */
-krb5_error_code
+KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
 krb5_ser_ccache_init(kcontext)
     krb5_context	kcontext;
 {