From dc0b2b8648d40957cb243b744cb12c38299f86ee Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Fri, 24 Jul 2009 02:34:58 -0400
Subject: [PATCH] Missing foo_LIB_FUNCTION fixes

---
 cf/make-proto.pl         | 3 ++-
 cf/win32.m4              | 1 +
 lib/krb5/appdefault.c    | 2 +-
 lib/krb5/context.c       | 4 ++--
 lib/krb5/init_creds_pw.c | 2 +-
 lib/krb5/pkinit.c        | 2 +-
 lib/krb5/prog_setup.c    | 2 +-
 lib/krb5/verify_init.c   | 2 +-
 lib/roken/dumpdata.c     | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cf/make-proto.pl b/cf/make-proto.pl
index cad5ced74..12c6d07f5 100644
--- a/cf/make-proto.pl
+++ b/cf/make-proto.pl
@@ -323,6 +323,7 @@ if ($opt_E) {
 #define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
 #define ${opt_E}_FUNCTION
+#define ${opt_E}_CALL
 #define ${opt_E}_VARIABLE
 #endif
 #endif
@@ -337,8 +338,8 @@ if ($opt_E) {
 #define ${opt_E}_VARIABLE __declspec(dllimport)
 #else
 #define ${opt_E}_FUNCTION
-#define ${opt_E}_VARIABLE
 #define ${opt_E}_CALL
+#define ${opt_E}_VARIABLE
 #endif
 #endif
 #endif
diff --git a/cf/win32.m4 b/cf/win32.m4
index ac53bd0c9..5561ad966 100644
--- a/cf/win32.m4
+++ b/cf/win32.m4
@@ -8,6 +8,7 @@ AC_DEFUN([rk_WIN32_EXPORT],[AH_TOP([#ifdef $1
 #define $2_VARIABLE __declspec(dllexport)
 #else
 #define $2_FUNCTION
+#define $2_CALL
 #define $2_VARIABLE
 #endif
 #endif
diff --git a/lib/krb5/appdefault.c b/lib/krb5/appdefault.c
index a54e4214e..d4dc758fa 100644
--- a/lib/krb5/appdefault.c
+++ b/lib/krb5/appdefault.c
@@ -75,7 +75,7 @@ krb5_appdefault_boolean(krb5_context context, const char *appname,
     *ret_val = def_val;
 }
 
-void KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_appdefault_string(krb5_context context, const char *appname,
 		       krb5_const_realm realm, const char *option,
 		       const char *def_val, char **ret_val)
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index a8aa1c682..c6454335a 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -373,7 +373,7 @@ copy_etypes (krb5_context context,
  * @ingroup krb5
  */
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_copy_context(krb5_context context, krb5_context *out)
 {
     krb5_error_code ret;
@@ -1195,7 +1195,7 @@ krb5_get_kdc_sec_offset (krb5_context context, int32_t *sec, int32_t *usec)
  * @ingroup krb5
  */
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_set_kdc_sec_offset (krb5_context context, int32_t sec, int32_t usec)
 {
     context->kdc_sec_offset = sec;
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index e364c711d..1c8fda462 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -1866,7 +1866,7 @@ krb5_init_creds_get_error(krb5_context context,
  * @ingroup krb5_credential
  */
 
-void KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_init_creds_free(krb5_context context,
 		     krb5_init_creds_context ctx)
 {
diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 67dfb9498..1d3845435 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -2528,7 +2528,7 @@ find_ms_san(hx509_context context, hx509_cert cert, void *ctx)
  * Private since it need to be redesigned using krb5_get_init_creds()
  */
 
-krb5_error_code  KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code  KRB5_LIB_CALL
 _krb5_pk_enterprise_cert(krb5_context context,
 			 const char *user_id,
 			 krb5_const_realm realm,
diff --git a/lib/krb5/prog_setup.c b/lib/krb5/prog_setup.c
index 33e8b5301..1e83b4d06 100644
--- a/lib/krb5/prog_setup.c
+++ b/lib/krb5/prog_setup.c
@@ -35,7 +35,7 @@
 #include <getarg.h>
 #include <err.h>
 
-KRB5_LIB_FUNCTION void
+KRB5_LIB_FUNCTION void KRB5_LIB_CALL
 krb5_std_usage(int code, struct getargs *args, int num_args)
 {
     arg_printusage(args, num_args, NULL, "");
diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
index f73942eb4..300cef007 100644
--- a/lib/krb5/verify_init.c
+++ b/lib/krb5/verify_init.c
@@ -211,7 +211,7 @@ cleanup:
  * @ingroup krb5_ccache
  */
 
-krb5_error_code KRB5_LIB_FUNCTION
+KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb5_get_validated_creds(krb5_context context,
 			 krb5_creds *creds,
 			 krb5_principal client,
diff --git a/lib/roken/dumpdata.c b/lib/roken/dumpdata.c
index 3280d7337..f30f0e54c 100644
--- a/lib/roken/dumpdata.c
+++ b/lib/roken/dumpdata.c
@@ -55,7 +55,7 @@ rk_dumpdata (const char *filename, const void *buf, size_t size)
  * Read all data from a filename, care about errors.
  */
 
-int ROKEN_LIB_FUNCTION
+ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
 rk_undumpdata(const char *filename, void **buf, size_t *size)
 {
     struct stat sb;