From 917e16049a3bec757563047a8e6f07e70a5de6c0 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sat, 29 Jan 2022 09:53:37 +1100
Subject: [PATCH] base: make heim_alloc deallocator use HEIM_CALLCONV

---
 lib/base/db.c          | 2 +-
 lib/base/heimbase.h    | 2 +-
 lib/base/plugin.c      | 2 +-
 lib/base/test_base.c   | 2 +-
 lib/krb5/krbhst.c      | 2 +-
 lib/krb5/send_to_kdc.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/base/db.c b/lib/base/db.c
index 3a27b853e..337552686 100644
--- a/lib/base/db.c
+++ b/lib/base/db.c
@@ -150,7 +150,7 @@ db_init_plugins_once(void *arg)
     db_plugins = heim_retain(arg);
 }
 
-static void
+static void HEIM_CALLCONV
 plugin_dealloc(void *arg)
 {
     db_plugin plug = arg;
diff --git a/lib/base/heimbase.h b/lib/base/heimbase.h
index f219cb8b3..3706fc871 100644
--- a/lib/base/heimbase.h
+++ b/lib/base/heimbase.h
@@ -173,7 +173,7 @@ void	heim_release(heim_object_t);
 
 void	heim_show(heim_object_t);
 
-typedef void (*heim_type_dealloc)(void *);
+typedef void (HEIM_CALLCONV *heim_type_dealloc)(void *);
 
 void *
 heim_alloc(size_t size, const char *name, heim_type_dealloc dealloc);
diff --git a/lib/base/plugin.c b/lib/base/plugin.c
index 88d04c03c..50352a749 100644
--- a/lib/base/plugin.c
+++ b/lib/base/plugin.c
@@ -112,7 +112,7 @@ struct heim_dso {
     void *dsohandle;
 };
 
-static void
+static void HEIM_CALLCONV
 dso_dealloc(void *ptr)
 {
     struct heim_dso *p = ptr;
diff --git a/lib/base/test_base.c b/lib/base/test_base.c
index a3d24661e..be6c860e2 100644
--- a/lib/base/test_base.c
+++ b/lib/base/test_base.c
@@ -64,7 +64,7 @@
 
 #include "baselocl.h"
 
-static void
+static void HEIM_CALLCONV
 memory_free(heim_object_t obj)
 {
 }
diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
index 925937a08..8fb87f8e1 100644
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -929,7 +929,7 @@ kpasswd_get_next(krb5_context context,
     return KRB5_KDC_UNREACH;
 }
 
-static void
+static void KRB5_CALLCONV
 krbhost_dealloc(void *ptr)
 {
     struct krb5_krbhst_data *handle = (struct krb5_krbhst_data *)ptr;
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index b039970e2..e52e6f249 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -176,7 +176,7 @@ struct krb5_sendto_ctx_data {
     unsigned int stid;
 };
 
-static void
+static void KRB5_CALLCONV
 dealloc_sendto_ctx(void *ptr)
 {
     krb5_sendto_ctx ctx = (krb5_sendto_ctx)ptr;