Fix windows build.

Fix calling convention.

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

diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog
index 67805625280131fa86abb9485e5c27dae3cc8f77..5c55de820c2f163878414486aa44acac46b2dbc9 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/ChangeLog
+++ b/src/lib/krb5/keytab/srvtab/ChangeLog
@@ -1,4 +1,17 @@
+1999-06-15  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Fix windows build.
+
+       * ktsrvtab.h, kts_resolv.c (krb5_ktsrvtab_resolve), 
+       kts_g_name.c (krb5_ktsrvtab_get_name), 
+       kts_close.c (krb5_ktsrvtab_close),
+       kts_g_ent.c (krb5_ktsrvtab_get_entry), 
+       kts_ssget.c (krb5_ktsrvtab_start_seq_get), 
+       kts_next.c (krb5_ktsrvtab_get_next), 
+       kts_endget.c (krb5_ktsrvtab_end_get): Fix calling convention.
+
+
 1999-06-13  Geoffrey King  <gjking@mit.edu>
 
        * Initial checkin of ghudson's code to implement the SRVTAB keytab
-       type, which can read a krb4 srvtab.
\ No newline at end of file
+       type, which can read a krb4 srvtab.

diff --git a/src/lib/krb5/keytab/srvtab/Makefile.in b/src/lib/krb5/keytab/srvtab/Makefile.in
index 5ac97f5518d507b2e422cb64829773fe9a64b8e0..001050cd1ff996affd19dce6b79e3e7eb3100f7d 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/Makefile.in
+++ b/src/lib/krb5/keytab/srvtab/Makefile.in
@@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=keytab\srvtab
-##DOS##OBJFILE=$(OUTPRE)file.lst
+##DOS##OBJFILE=$(OUTPRE)srvtab.lst
 ##WIN16##LIBNAME=..\..\krb5.lib
 
 STLIBOBJS= \
@@ -44,8 +44,6 @@ SRCS= \
        $(srcdir)/kts_ssget.c   \
        $(srcdir)/kts_util.c
 
-all-windows:: subdirs $(OBJFILE)
-
 ##DOS##LIBOBJS = $(OBJS)
 
 all-unix:: all-libobjs

diff --git a/src/lib/krb5/keytab/srvtab/kts_close.c b/src/lib/krb5/keytab/srvtab/kts_close.c
index 091444028ebea4b5ac4645baf79bc16817aec347..1d66d7ed5890ab4e36ed53f7c92a716cfbb242cb 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_close.c
+++ b/src/lib/krb5/keytab/srvtab/kts_close.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_close(context, id)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/kts_endget.c b/src/lib/krb5/keytab/srvtab/kts_endget.c
index c58dc543e39a98786a501549770790e25d1a667f..035e9c51d4147681e04d237bfce58b6b6aa0db5b 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_endget.c
+++ b/src/lib/krb5/keytab/srvtab/kts_endget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_end_get(context, id, cursor)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/kts_g_ent.c b/src/lib/krb5/keytab/srvtab/kts_g_ent.c
index ac3e9487dc0a11055acdd83568f4c1c17166c39f..01a0379bac2838ead97987c72f430cfc15067432 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_g_ent.c
+++ b/src/lib/krb5/keytab/srvtab/kts_g_ent.c
@@ -29,7 +29,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_get_entry(context, id, principal, kvno, enctype, entry)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/kts_g_name.c b/src/lib/krb5/keytab/srvtab/kts_g_name.c
index 4bc759abbf602911c15b60ad406af066b4ab2fb9..74555600c7816ab08eeed61b1ca4fc29fed86a2d 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_g_name.c
+++ b/src/lib/krb5/keytab/srvtab/kts_g_name.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_get_name(context, id, name, len)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/kts_next.c b/src/lib/krb5/keytab/srvtab/kts_next.c
index db1b9a93115d7c688ba5311ab85cdeb8b35ab0b2..275e738d8bc06c8daba3130b9eb1ee8c9da91562 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_next.c
+++ b/src/lib/krb5/keytab/srvtab/kts_next.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_get_next(context, id, entry, cursor)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/kts_resolv.c b/src/lib/krb5/keytab/srvtab/kts_resolv.c
index 76009bc1922e9f5b4f891373414ff244968dbf73..795a82887bed0ead27af165597b311243467fadf 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_resolv.c
+++ b/src/lib/krb5/keytab/srvtab/kts_resolv.c
@@ -28,7 +28,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_resolve(context, name, id)
     krb5_context context;
     const char *name;

diff --git a/src/lib/krb5/keytab/srvtab/kts_ssget.c b/src/lib/krb5/keytab/srvtab/kts_ssget.c
index 21b88ccc0959f105d8cac1111f9f4e7e7552755a..edb252264067379a951a9e7d4d80fe0e3113f74d 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/kts_ssget.c
+++ b/src/lib/krb5/keytab/srvtab/kts_ssget.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "ktsrvtab.h"
 
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
 krb5_ktsrvtab_start_seq_get(context, id, cursorp)
     krb5_context context;
     krb5_keytab id;

diff --git a/src/lib/krb5/keytab/srvtab/ktsrvtab.h b/src/lib/krb5/keytab/srvtab/ktsrvtab.h
index 4c274e0ae2049b41b5a03497e1d4fbd39ee560e0..071a27d10f7b590b042d0caafca8d80a3b139ce0 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/ktsrvtab.h
+++ b/src/lib/krb5/keytab/srvtab/ktsrvtab.h
@@ -59,22 +59,22 @@ typedef struct _krb5_ktsrvtab_data {
 
 extern struct _krb5_kt_ops krb5_kts_ops;
 
-krb5_error_code krb5_ktsrvtab_resolve
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve
        PROTOTYPE((krb5_context,
                   const char *,
                   krb5_keytab *));
 
-krb5_error_code krb5_ktsrvtab_get_name
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   char *,
                   int));
 
-krb5_error_code krb5_ktsrvtab_close
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close
        PROTOTYPE((krb5_context,
                   krb5_keytab));
 
-krb5_error_code krb5_ktsrvtab_get_entry
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_principal,
@@ -82,18 +82,18 @@ krb5_error_code krb5_ktsrvtab_get_entry
                   krb5_enctype,
                   krb5_keytab_entry *));
 
-krb5_error_code krb5_ktsrvtab_start_seq_get
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktsrvtab_get_next
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_keytab_entry *,
                   krb5_kt_cursor *));
 
-krb5_error_code krb5_ktsrvtab_end_get
+krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get
        PROTOTYPE((krb5_context,
                   krb5_keytab,
                   krb5_kt_cursor *));