summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2011-09-28 20:56:30 +0000
committerSam Hartman <hartmans@mit.edu>2011-09-28 20:56:30 +0000
commit543f77349c1cfc6fa16ad4304ee29d730a0926cd (patch)
tree387cf9295e12b029f8a050de1187e6a8dd83c7e2
parentd50417cea819e8f9bf95bdc1de5213588f7c42e0 (diff)
downloadkrb5-543f77349c1cfc6fa16ad4304ee29d730a0926cd.tar.gz
krb5-543f77349c1cfc6fa16ad4304ee29d730a0926cd.tar.xz
krb5-543f77349c1cfc6fa16ad4304ee29d730a0926cd.zip
Windows fixes: add KRB5_CALLCONV where needed
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com> git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25269 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/gssapi/krb5/accept_sec_context.c2
-rw-r--r--src/lib/krb5/ccache/cccursor.c2
-rw-r--r--src/lib/krb5/os/trace.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index a41968ed8..40dfa8bd2 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -1295,7 +1295,7 @@ done:
}
#endif /* LEAN_CLIENT */
-OM_uint32
+OM_uint32 KRB5_CALLCONV
krb5_gss_accept_sec_context_ext(
OM_uint32 *minor_status,
gss_ctx_id_t *context_handle,
diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c
index 23681f99f..9f366ce06 100644
--- a/src/lib/krb5/ccache/cccursor.c
+++ b/src/lib/krb5/ccache/cccursor.c
@@ -175,7 +175,7 @@ krb5_cccol_last_change_time(krb5_context context,
* krb5_cccol_lock and krb5_cccol_unlock are defined in ccbase.c
*/
-krb5_error_code
+krb5_error_code KRB5_CALLCONV
krb5_cc_cache_match(krb5_context context, krb5_principal client,
krb5_ccache *cache_out)
{
diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c
index a31b0059f..36aad31fa 100644
--- a/src/lib/krb5/os/trace.c
+++ b/src/lib/krb5/os/trace.c
@@ -313,7 +313,7 @@ krb5_set_trace_callback(krb5_context context, krb5_trace_callback fn,
return 0;
}
-static void
+static void KRB5_CALLCONV
file_trace_cb(krb5_context context, const struct krb5_trace_info *info, void *data)
{
int *fd = data;