From 565f2aad8a34d3bd48b82f75a2cbc52f41b8464d Mon Sep 17 00:00:00 2001
From: Alexey Melnikov <alexey.melnikov@isode.com>
Date: Mon, 13 Jun 2011 18:40:47 +0100
Subject: [PATCH] Fixed calling convention for functions exported from gssapi.h

On Windows all functions exported from gssapi.h have KRB5_CALLCONV
calling convention. This is needed in order to compile correctly on Windows.
---
 moonshot/mech_eap/accept_sec_context.c         |  2 +-
 moonshot/mech_eap/acquire_cred.c               |  2 +-
 moonshot/mech_eap/add_cred.c                   |  2 +-
 moonshot/mech_eap/add_cred_with_password.c     |  2 +-
 moonshot/mech_eap/canonicalize_name.c          |  2 +-
 moonshot/mech_eap/compare_name.c               |  2 +-
 moonshot/mech_eap/context_time.c               |  2 +-
 moonshot/mech_eap/delete_name_attribute.c      |  2 +-
 moonshot/mech_eap/delete_sec_context.c         |  2 +-
 moonshot/mech_eap/display_name.c               |  2 +-
 moonshot/mech_eap/display_name_ext.c           |  2 +-
 moonshot/mech_eap/display_status.c             |  2 +-
 moonshot/mech_eap/duplicate_name.c             |  2 +-
 moonshot/mech_eap/export_name.c                |  2 +-
 moonshot/mech_eap/export_name_composite.c      |  2 +-
 moonshot/mech_eap/export_sec_context.c         |  2 +-
 moonshot/mech_eap/get_mic.c                    |  2 +-
 moonshot/mech_eap/get_name_attribute.c         |  2 +-
 moonshot/mech_eap/import_name.c                |  2 +-
 moonshot/mech_eap/import_sec_context.c         |  2 +-
 moonshot/mech_eap/indicate_mechs.c             |  2 +-
 moonshot/mech_eap/init_sec_context.c           |  2 +-
 moonshot/mech_eap/inquire_attrs_for_mech.c     |  3 ++-
 moonshot/mech_eap/inquire_context.c            |  2 +-
 moonshot/mech_eap/inquire_cred.c               |  2 +-
 moonshot/mech_eap/inquire_cred_by_oid.c        |  2 +-
 moonshot/mech_eap/inquire_mech_for_saslname.c  |  2 +-
 moonshot/mech_eap/inquire_mechs_for_name.c     |  2 +-
 moonshot/mech_eap/inquire_name.c               | 11 ++++++-----
 moonshot/mech_eap/inquire_names_for_mech.c     |  2 +-
 moonshot/mech_eap/inquire_saslname_for_mech.c  |  2 +-
 moonshot/mech_eap/inquire_sec_context_by_oid.c |  2 +-
 moonshot/mech_eap/map_name_to_any.c            |  2 +-
 moonshot/mech_eap/process_context_token.c      |  2 +-
 moonshot/mech_eap/pseudo_random.c              |  2 +-
 moonshot/mech_eap/release_any_name_mapping.c   |  2 +-
 moonshot/mech_eap/release_cred.c               |  2 +-
 moonshot/mech_eap/release_name.c               |  2 +-
 moonshot/mech_eap/set_name_attribute.c         |  2 +-
 moonshot/mech_eap/set_sec_context_option.c     |  2 +-
 moonshot/mech_eap/store_cred.c                 |  2 +-
 moonshot/mech_eap/unwrap.c                     |  2 +-
 moonshot/mech_eap/unwrap_iov.c                 |  2 +-
 moonshot/mech_eap/verify_mic.c                 |  2 +-
 moonshot/mech_eap/wrap.c                       |  2 +-
 moonshot/mech_eap/wrap_iov.c                   |  2 +-
 moonshot/mech_eap/wrap_iov_length.c            |  2 +-
 moonshot/mech_eap/wrap_size_limit.c            |  2 +-
 48 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/moonshot/mech_eap/accept_sec_context.c b/moonshot/mech_eap/accept_sec_context.c
index 65bb9ce..7d3dfed 100644
--- a/moonshot/mech_eap/accept_sec_context.c
+++ b/moonshot/mech_eap/accept_sec_context.c
@@ -807,7 +807,7 @@ static struct gss_eap_sm eapGssAcceptorSm[] = {
 #define ACCEPTOR_PARAM(p) UNUSED_PARAM(p)
 #endif
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_accept_sec_context(OM_uint32 *ACCEPTOR_PARAM(minor),
                        gss_ctx_id_t *ACCEPTOR_PARAM(context_handle),
                        gss_cred_id_t ACCEPTOR_PARAM(cred),
diff --git a/moonshot/mech_eap/acquire_cred.c b/moonshot/mech_eap/acquire_cred.c
index 2326eaa..5ae30f9 100644
--- a/moonshot/mech_eap/acquire_cred.c
+++ b/moonshot/mech_eap/acquire_cred.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_acquire_cred(OM_uint32 *minor,
                  gss_name_t desired_name,
                  OM_uint32 time_req,
diff --git a/moonshot/mech_eap/add_cred.c b/moonshot/mech_eap/add_cred.c
index 37d0add..81c74b2 100644
--- a/moonshot/mech_eap/add_cred.c
+++ b/moonshot/mech_eap/add_cred.c
@@ -41,7 +41,7 @@
  * apart from the mechanism glue layer. However, Heimdal does call into the
  * mechanism here.
  */
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_add_cred(OM_uint32 *minor,
              gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
              gss_name_t desired_name,
diff --git a/moonshot/mech_eap/add_cred_with_password.c b/moonshot/mech_eap/add_cred_with_password.c
index 7907138..7b7ac1c 100644
--- a/moonshot/mech_eap/add_cred_with_password.c
+++ b/moonshot/mech_eap/add_cred_with_password.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_add_cred_with_password(OM_uint32 *minor,
                            const gss_cred_id_t input_cred_handle GSSEAP_UNUSED,
                            const gss_name_t desired_name,
diff --git a/moonshot/mech_eap/canonicalize_name.c b/moonshot/mech_eap/canonicalize_name.c
index 82d96b6..a84dafb 100644
--- a/moonshot/mech_eap/canonicalize_name.c
+++ b/moonshot/mech_eap/canonicalize_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_canonicalize_name(OM_uint32 *minor,
                       const gss_name_t input_name,
                       const gss_OID mech_type,
diff --git a/moonshot/mech_eap/compare_name.c b/moonshot/mech_eap/compare_name.c
index 1da4d98..7e0e499 100644
--- a/moonshot/mech_eap/compare_name.c
+++ b/moonshot/mech_eap/compare_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_compare_name(OM_uint32 *minor,
                  gss_name_t name1,
                  gss_name_t name2,
diff --git a/moonshot/mech_eap/context_time.c b/moonshot/mech_eap/context_time.c
index 1486065..c6d75a1 100644
--- a/moonshot/mech_eap/context_time.c
+++ b/moonshot/mech_eap/context_time.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_context_time(OM_uint32 *minor,
                  gss_ctx_id_t ctx,
                  OM_uint32 *time_rec)
diff --git a/moonshot/mech_eap/delete_name_attribute.c b/moonshot/mech_eap/delete_name_attribute.c
index 3011e94..2d91283 100644
--- a/moonshot/mech_eap/delete_name_attribute.c
+++ b/moonshot/mech_eap/delete_name_attribute.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_delete_name_attribute(OM_uint32 *minor,
                           gss_name_t name,
                           gss_buffer_t attr)
diff --git a/moonshot/mech_eap/delete_sec_context.c b/moonshot/mech_eap/delete_sec_context.c
index 7bd9cfb..af878fd 100644
--- a/moonshot/mech_eap/delete_sec_context.c
+++ b/moonshot/mech_eap/delete_sec_context.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_delete_sec_context(OM_uint32 *minor,
                        gss_ctx_id_t *context_handle,
                        gss_buffer_t output_token)
diff --git a/moonshot/mech_eap/display_name.c b/moonshot/mech_eap/display_name.c
index 427dcf2..b0cb4ba 100644
--- a/moonshot/mech_eap/display_name.c
+++ b/moonshot/mech_eap/display_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_display_name(OM_uint32 *minor,
                  gss_name_t name,
                  gss_buffer_t output_name_buffer,
diff --git a/moonshot/mech_eap/display_name_ext.c b/moonshot/mech_eap/display_name_ext.c
index dff525f..ec9efbe 100644
--- a/moonshot/mech_eap/display_name_ext.c
+++ b/moonshot/mech_eap/display_name_ext.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_display_name_ext(OM_uint32 *minor,
                      gss_name_t name GSSEAP_UNUSED,
                      gss_OID display_as_name_type GSSEAP_UNUSED,
diff --git a/moonshot/mech_eap/display_status.c b/moonshot/mech_eap/display_status.c
index b3cf2f9..2b41f18 100644
--- a/moonshot/mech_eap/display_status.c
+++ b/moonshot/mech_eap/display_status.c
@@ -138,7 +138,7 @@ gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...)
     saveStatusInfoNoCopy(minor, s);
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_display_status(OM_uint32 *minor,
                    OM_uint32 status_value,
                    int status_type,
diff --git a/moonshot/mech_eap/duplicate_name.c b/moonshot/mech_eap/duplicate_name.c
index b618b3d..1d65c16 100644
--- a/moonshot/mech_eap/duplicate_name.c
+++ b/moonshot/mech_eap/duplicate_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_duplicate_name(OM_uint32 *minor,
                    const gss_name_t input_name,
                    gss_name_t *dest_name)
diff --git a/moonshot/mech_eap/export_name.c b/moonshot/mech_eap/export_name.c
index 7a37e30..086bfca 100644
--- a/moonshot/mech_eap/export_name.c
+++ b/moonshot/mech_eap/export_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_export_name(OM_uint32 *minor,
                 const gss_name_t input_name,
                 gss_buffer_t exported_name)
diff --git a/moonshot/mech_eap/export_name_composite.c b/moonshot/mech_eap/export_name_composite.c
index 7fb9840..7b70e35 100644
--- a/moonshot/mech_eap/export_name_composite.c
+++ b/moonshot/mech_eap/export_name_composite.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_export_name_composite(OM_uint32 *minor,
                           gss_name_t input_name,
                           gss_buffer_t exported_name)
diff --git a/moonshot/mech_eap/export_sec_context.c b/moonshot/mech_eap/export_sec_context.c
index 3176bfe..98003d5 100644
--- a/moonshot/mech_eap/export_sec_context.c
+++ b/moonshot/mech_eap/export_sec_context.c
@@ -208,7 +208,7 @@ cleanup:
     return major;
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_export_sec_context(OM_uint32 *minor,
                        gss_ctx_id_t *context_handle,
                        gss_buffer_t interprocess_token)
diff --git a/moonshot/mech_eap/get_mic.c b/moonshot/mech_eap/get_mic.c
index c19e68f..1ac8d93 100644
--- a/moonshot/mech_eap/get_mic.c
+++ b/moonshot/mech_eap/get_mic.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_get_mic(OM_uint32 *minor,
             gss_ctx_id_t ctx,
             gss_qop_t qop_req,
diff --git a/moonshot/mech_eap/get_name_attribute.c b/moonshot/mech_eap/get_name_attribute.c
index d616622..a77577b 100644
--- a/moonshot/mech_eap/get_name_attribute.c
+++ b/moonshot/mech_eap/get_name_attribute.c
@@ -36,7 +36,7 @@
  * Wrapper for retrieving a naming attribute.
  */
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_get_name_attribute(OM_uint32 *minor,
                        gss_name_t name,
                        gss_buffer_t attr,
diff --git a/moonshot/mech_eap/import_name.c b/moonshot/mech_eap/import_name.c
index 87f0830..fbde67d 100644
--- a/moonshot/mech_eap/import_name.c
+++ b/moonshot/mech_eap/import_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_import_name(OM_uint32 *minor,
                 gss_buffer_t import_name_buffer,
                 gss_OID input_name_type,
diff --git a/moonshot/mech_eap/import_sec_context.c b/moonshot/mech_eap/import_sec_context.c
index e0012bd..8854bf4 100644
--- a/moonshot/mech_eap/import_sec_context.c
+++ b/moonshot/mech_eap/import_sec_context.c
@@ -328,7 +328,7 @@ gssEapImportContext(OM_uint32 *minor,
     return major;
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_import_sec_context(OM_uint32 *minor,
                        gss_buffer_t interprocess_token,
                        gss_ctx_id_t *context_handle)
diff --git a/moonshot/mech_eap/indicate_mechs.c b/moonshot/mech_eap/indicate_mechs.c
index ff88b4d..24b6f85 100644
--- a/moonshot/mech_eap/indicate_mechs.c
+++ b/moonshot/mech_eap/indicate_mechs.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_indicate_mechs(OM_uint32 *minor,
                    gss_OID_set *mech_set)
 {
diff --git a/moonshot/mech_eap/init_sec_context.c b/moonshot/mech_eap/init_sec_context.c
index 930eb32..023f70e 100644
--- a/moonshot/mech_eap/init_sec_context.c
+++ b/moonshot/mech_eap/init_sec_context.c
@@ -897,7 +897,7 @@ static struct gss_eap_sm eapGssInitiatorSm[] = {
     }
 };
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_init_sec_context(OM_uint32 *minor,
                      gss_cred_id_t cred,
                      gss_ctx_id_t *context_handle,
diff --git a/moonshot/mech_eap/inquire_attrs_for_mech.c b/moonshot/mech_eap/inquire_attrs_for_mech.c
index b85953b..ec37491 100644
--- a/moonshot/mech_eap/inquire_attrs_for_mech.c
+++ b/moonshot/mech_eap/inquire_attrs_for_mech.c
@@ -45,7 +45,8 @@
 #define MA_SUPPORTED(ma)    MA_ADD((ma), mech_attrs)
 #define MA_KNOWN(ma)        MA_ADD((ma), known_mech_attrs)
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
+OM_uint32 KRB5_CALLCONV
 gss_inquire_attrs_for_mech(OM_uint32 *minor,
                            gss_const_OID mech_oid,
                            gss_OID_set *mech_attrs,
diff --git a/moonshot/mech_eap/inquire_context.c b/moonshot/mech_eap/inquire_context.c
index 0e7b586..1c85662 100644
--- a/moonshot/mech_eap/inquire_context.c
+++ b/moonshot/mech_eap/inquire_context.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_context(OM_uint32 *minor,
                     gss_ctx_id_t ctx,
                     gss_name_t *src_name,
diff --git a/moonshot/mech_eap/inquire_cred.c b/moonshot/mech_eap/inquire_cred.c
index 6c0114b..fc59e61 100644
--- a/moonshot/mech_eap/inquire_cred.c
+++ b/moonshot/mech_eap/inquire_cred.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred(OM_uint32 *minor,
                  gss_cred_id_t cred,
                  gss_name_t *name,
diff --git a/moonshot/mech_eap/inquire_cred_by_oid.c b/moonshot/mech_eap/inquire_cred_by_oid.c
index b4a95f8..01fc240 100644
--- a/moonshot/mech_eap/inquire_cred_by_oid.c
+++ b/moonshot/mech_eap/inquire_cred_by_oid.c
@@ -43,7 +43,7 @@ static struct {
 } inquireCredOps[] = {
 };
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_oid(OM_uint32 *minor,
                         const gss_cred_id_t cred_handle,
                         const gss_OID desired_object,
diff --git a/moonshot/mech_eap/inquire_mech_for_saslname.c b/moonshot/mech_eap/inquire_mech_for_saslname.c
index c2f7914..c6411b1 100644
--- a/moonshot/mech_eap/inquire_mech_for_saslname.c
+++ b/moonshot/mech_eap/inquire_mech_for_saslname.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_saslname_for_mech(OM_uint32 *minor,
                               const gss_OID mech,
                               gss_buffer_t sasl_mech_name,
diff --git a/moonshot/mech_eap/inquire_mechs_for_name.c b/moonshot/mech_eap/inquire_mechs_for_name.c
index ca5d365..863a810 100644
--- a/moonshot/mech_eap/inquire_mechs_for_name.c
+++ b/moonshot/mech_eap/inquire_mechs_for_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_mechs_for_name(OM_uint32 *minor,
                            const gss_name_t input_name,
                            gss_OID_set *mech_types)
diff --git a/moonshot/mech_eap/inquire_name.c b/moonshot/mech_eap/inquire_name.c
index 2a4e0e3..3e707ed 100644
--- a/moonshot/mech_eap/inquire_name.c
+++ b/moonshot/mech_eap/inquire_name.c
@@ -36,11 +36,12 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32 gss_inquire_name(OM_uint32 *minor,
-                           gss_name_t name,
-                           int *name_is_MN,
-                           gss_OID *MN_mech,
-                           gss_buffer_set_t *attrs)
+OM_uint32 KRB5_CALLCONV
+gss_inquire_name(OM_uint32 *minor,
+                 gss_name_t name,
+                 int *name_is_MN,
+                 gss_OID *MN_mech,
+                 gss_buffer_set_t *attrs)
 {
     OM_uint32 major, tmpMinor;
 
diff --git a/moonshot/mech_eap/inquire_names_for_mech.c b/moonshot/mech_eap/inquire_names_for_mech.c
index e01740a..1f99eb7 100644
--- a/moonshot/mech_eap/inquire_names_for_mech.c
+++ b/moonshot/mech_eap/inquire_names_for_mech.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_names_for_mech(OM_uint32 *minor,
                            gss_OID mechanism,
                            gss_OID_set *ret_name_types)
diff --git a/moonshot/mech_eap/inquire_saslname_for_mech.c b/moonshot/mech_eap/inquire_saslname_for_mech.c
index aec2a85..3564c1c 100644
--- a/moonshot/mech_eap/inquire_saslname_for_mech.c
+++ b/moonshot/mech_eap/inquire_saslname_for_mech.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_mech_for_saslname(OM_uint32 *minor,
                               const gss_buffer_t sasl_mech_name,
                               gss_OID *mech_type)
diff --git a/moonshot/mech_eap/inquire_sec_context_by_oid.c b/moonshot/mech_eap/inquire_sec_context_by_oid.c
index a69b9e9..537ff25 100644
--- a/moonshot/mech_eap/inquire_sec_context_by_oid.c
+++ b/moonshot/mech_eap/inquire_sec_context_by_oid.c
@@ -104,7 +104,7 @@ static struct {
     },
 };
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_inquire_sec_context_by_oid(OM_uint32 *minor,
                                const gss_ctx_id_t ctx,
                                const gss_OID desired_object,
diff --git a/moonshot/mech_eap/map_name_to_any.c b/moonshot/mech_eap/map_name_to_any.c
index 6f952e3..bb61cca 100644
--- a/moonshot/mech_eap/map_name_to_any.c
+++ b/moonshot/mech_eap/map_name_to_any.c
@@ -32,7 +32,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_map_name_to_any(OM_uint32 *minor,
                     gss_name_t name,
                     int authenticated,
diff --git a/moonshot/mech_eap/process_context_token.c b/moonshot/mech_eap/process_context_token.c
index 5bad3c0..7f0310d 100644
--- a/moonshot/mech_eap/process_context_token.c
+++ b/moonshot/mech_eap/process_context_token.c
@@ -32,7 +32,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_process_context_token(OM_uint32 *minor,
                           gss_ctx_id_t ctx,
                           gss_buffer_t token_buffer)
diff --git a/moonshot/mech_eap/pseudo_random.c b/moonshot/mech_eap/pseudo_random.c
index 4bbf542..684af94 100644
--- a/moonshot/mech_eap/pseudo_random.c
+++ b/moonshot/mech_eap/pseudo_random.c
@@ -59,7 +59,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_pseudo_random(OM_uint32 *minor,
                   gss_ctx_id_t ctx,
                   int prf_key,
diff --git a/moonshot/mech_eap/release_any_name_mapping.c b/moonshot/mech_eap/release_any_name_mapping.c
index 54d3162..7b84f80 100644
--- a/moonshot/mech_eap/release_any_name_mapping.c
+++ b/moonshot/mech_eap/release_any_name_mapping.c
@@ -32,7 +32,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_release_any_name_mapping(OM_uint32 *minor,
                              gss_name_t name,
                              gss_buffer_t type_id,
diff --git a/moonshot/mech_eap/release_cred.c b/moonshot/mech_eap/release_cred.c
index 57ba829..c7d3645 100644
--- a/moonshot/mech_eap/release_cred.c
+++ b/moonshot/mech_eap/release_cred.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_release_cred(OM_uint32 *minor,
                  gss_cred_id_t *cred_handle)
 {
diff --git a/moonshot/mech_eap/release_name.c b/moonshot/mech_eap/release_name.c
index fb267a5..0bbf537 100644
--- a/moonshot/mech_eap/release_name.c
+++ b/moonshot/mech_eap/release_name.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_release_name(OM_uint32 *minor,
                  gss_name_t *name)
 {
diff --git a/moonshot/mech_eap/set_name_attribute.c b/moonshot/mech_eap/set_name_attribute.c
index b8793b4..961bdef 100644
--- a/moonshot/mech_eap/set_name_attribute.c
+++ b/moonshot/mech_eap/set_name_attribute.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_set_name_attribute(OM_uint32 *minor,
                        gss_name_t name,
                        int complete,
diff --git a/moonshot/mech_eap/set_sec_context_option.c b/moonshot/mech_eap/set_sec_context_option.c
index 45ef266..8b4e801 100644
--- a/moonshot/mech_eap/set_sec_context_option.c
+++ b/moonshot/mech_eap/set_sec_context_option.c
@@ -43,7 +43,7 @@ static struct {
 } setCtxOps[] = {
 };
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_set_sec_context_option(OM_uint32 *minor,
                            gss_ctx_id_t *pCtx,
                            const gss_OID desired_object,
diff --git a/moonshot/mech_eap/store_cred.c b/moonshot/mech_eap/store_cred.c
index 2847f42..5beb730 100644
--- a/moonshot/mech_eap/store_cred.c
+++ b/moonshot/mech_eap/store_cred.c
@@ -32,7 +32,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_store_cred(OM_uint32 *minor,
                const gss_cred_id_t cred,
                gss_cred_usage_t input_usage,
diff --git a/moonshot/mech_eap/unwrap.c b/moonshot/mech_eap/unwrap.c
index ae35bf9..e3d5d6f 100644
--- a/moonshot/mech_eap/unwrap.c
+++ b/moonshot/mech_eap/unwrap.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_unwrap(OM_uint32 *minor,
            gss_ctx_id_t ctx,
            gss_buffer_t input_message_buffer,
diff --git a/moonshot/mech_eap/unwrap_iov.c b/moonshot/mech_eap/unwrap_iov.c
index 19bafc6..30318c7 100644
--- a/moonshot/mech_eap/unwrap_iov.c
+++ b/moonshot/mech_eap/unwrap_iov.c
@@ -529,7 +529,7 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor,
     return major;
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_unwrap_iov(OM_uint32 *minor,
                gss_ctx_id_t ctx,
                int *conf_state,
diff --git a/moonshot/mech_eap/verify_mic.c b/moonshot/mech_eap/verify_mic.c
index 0a56949..89bb081 100644
--- a/moonshot/mech_eap/verify_mic.c
+++ b/moonshot/mech_eap/verify_mic.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_verify_mic(OM_uint32 *minor,
                gss_ctx_id_t ctx,
                gss_buffer_t message_buffer,
diff --git a/moonshot/mech_eap/wrap.c b/moonshot/mech_eap/wrap.c
index a89bcb6..ef1b5fc 100644
--- a/moonshot/mech_eap/wrap.c
+++ b/moonshot/mech_eap/wrap.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_wrap(OM_uint32 *minor,
          gss_ctx_id_t ctx,
          int conf_req_flag,
diff --git a/moonshot/mech_eap/wrap_iov.c b/moonshot/mech_eap/wrap_iov.c
index 31450fc..0162916 100644
--- a/moonshot/mech_eap/wrap_iov.c
+++ b/moonshot/mech_eap/wrap_iov.c
@@ -336,7 +336,7 @@ cleanup:
     return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_wrap_iov(OM_uint32 *minor,
              gss_ctx_id_t ctx,
              int conf_req_flag,
diff --git a/moonshot/mech_eap/wrap_iov_length.c b/moonshot/mech_eap/wrap_iov_length.c
index 229fec7..9ee1364 100644
--- a/moonshot/mech_eap/wrap_iov_length.c
+++ b/moonshot/mech_eap/wrap_iov_length.c
@@ -196,7 +196,7 @@ gssEapWrapIovLength(OM_uint32 *minor,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_wrap_iov_length(OM_uint32 *minor,
                     gss_ctx_id_t ctx,
                     int conf_req_flag,
diff --git a/moonshot/mech_eap/wrap_size_limit.c b/moonshot/mech_eap/wrap_size_limit.c
index aadf1b4..b5f9cdf 100644
--- a/moonshot/mech_eap/wrap_size_limit.c
+++ b/moonshot/mech_eap/wrap_size_limit.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-OM_uint32
+OM_uint32 KRB5_CALLCONV
 gss_wrap_size_limit(OM_uint32 *minor,
                     gss_ctx_id_t ctx,
                     int conf_req_flag,
-- 
2.1.4