From 33bb2479b9a7538c1153639dacc02ff46109c215 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 27 May 2020 22:16:52 -0400
Subject: [PATCH] base: common_plugin.h define KRB5_CALLCONV / KRB5_LIB_CALL

common_plugin.h is expected to be usable on its own.
For backward compatibility, restore the definitions of
KRB5_CALLCONV and KRB5_LIB_CALL.

Change-Id: I6d2239f91ab48b9a6b71816b5221807382dc5914
---
 lib/base/common_plugin.h | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/base/common_plugin.h b/lib/base/common_plugin.h
index 27dace944..82c589563 100644
--- a/lib/base/common_plugin.h
+++ b/lib/base/common_plugin.h
@@ -37,19 +37,25 @@
 #define HEIMDAL_BASE_COMMON_PLUGIN_H
 
 #ifdef _WIN32
-#ifndef HEIM_CALLCONV
-#define HEIM_CALLCONV __stdcall
-#endif
-#ifndef HEIM_LIB_CALL
-#define HEIM_LIB_CALL __stdcall
-#endif
+# ifndef HEIM_CALLCONV
+#  define HEIM_CALLCONV __stdcall
+# endif
+# ifndef HEIM_LIB_CALL
+#  define HEIM_LIB_CALL __stdcall
+# endif
 #else
-#ifndef HEIM_CALLCONV
-#define HEIM_CALLCONV
+# ifndef HEIM_CALLCONV
+#  define HEIM_CALLCONV
+# endif
+# ifndef HEIM_LIB_CALL
+#  define HEIM_LIB_CALL
+# endif
 #endif
-#ifndef HEIM_LIB_CALL
-#define HEIM_LIB_CALL
+#ifndef KRB5_CALLCONV
+# define KRB5_CALLCONV HEIM_CALLCONV
 #endif
+#ifndef KRB5_LIB_CALL
+# define KRB5_LIB_CALL HEIM_LIB_CALL
 #endif
 
 /* For krb5 plugins, this is a krb5_context */