fix calling convention for thread support fns

This depends on a change to k5-thread.h that was included with a checkin I did
earlier for 2878.

* threads.c (k5_mutex_lock_update_stats, krb5int_mutex_unlock_update_stats,
krb5int_mutex_report_stats): Define as KRB5_CALLCONV.
(krb5int_mutex_lock_update_stats, krb5int_mutex_unlock_update_stats,
krb5int_mutex_report_stats) [_WIN32]: Undef macros before defining functions.

ticket: new
target_version: 1.4
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17037 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog
index 05a9df9364fd046d1eda957f266145b7a8ffacf4..4e0aaa679a05578ff46ff2907e08df9a2a35e58f 100644 (file)
--- a/src/util/support/ChangeLog
+++ b/src/util/support/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-14  Ken Raeburn  <raeburn@mit.edu>
+
+       * threads.c (k5_mutex_lock_update_stats,
+       krb5int_mutex_unlock_update_stats, krb5int_mutex_report_stats):
+       Define as KRB5_CALLCONV.
+       (krb5int_mutex_lock_update_stats,
+       krb5int_mutex_unlock_update_stats, krb5int_mutex_report_stats)
+       [_WIN32]: Undef macros before defining functions.
+
 2005-01-04  Ken Raeburn  <raeburn@mit.edu>
 
        * threads.c (krb5int_mutex_lock_update_stats,

diff --git a/src/util/support/threads.c b/src/util/support/threads.c
index 67b7e07c54a477de33d3a629e3fce396fff8d43f..44b64201f4720f2dd7e566dc6196b74f058a36e5 100644 (file)
--- a/src/util/support/threads.c
+++ b/src/util/support/threads.c
@@ -406,7 +406,7 @@ void krb5int_thread_support_fini (void)
 }
 
 #ifdef DEBUG_THREADS_STATS
-void
+void KRB5_CALLCONV
 k5_mutex_lock_update_stats(k5_debug_mutex_stats *m,
                           k5_mutex_stats_tmp startwait)
 {
@@ -427,7 +427,7 @@ k5_mutex_lock_update_stats(k5_debug_mutex_stats *m,
   m->lockwait.valsqsum += tdiff2;
 }
 
-void
+void KRB5_CALLCONV
 krb5int_mutex_unlock_update_stats(k5_debug_mutex_stats *m)
 {
   k5_debug_time_t now = get_current_time();
@@ -458,7 +458,7 @@ get_stddev(struct k5_timediff_stats sp, int count)
   return sqrt(rho_squared);
 }
 
-void
+void KRB5_CALLCONV
 krb5int_mutex_report_stats(k5_mutex_t *m)
 {
   char *p;
@@ -499,16 +499,19 @@ krb5int_mutex_report_stats(k5_mutex_t *m)
 /* On Windows, everything defined in the export list must be defined.
    The UNIX systems where we're using the export list don't seem to
    care.  */
-void
+#undef krb5int_mutex_lock_update_stats
+void KRB5_CALLCONV
 krb5int_mutex_lock_update_stats(k5_debug_mutex_stats *m,
                                k5_mutex_stats_tmp startwait)
 {
 }
-void
+#undef krb5int_mutex_unlock_update_stats
+void KRB5_CALLCONV
 krb5int_mutex_unlock_update_stats(k5_debug_mutex_stats *m)
 {
 }
-void
+#undef krb5int_mutex_report_stats
+void KRB5_CALLCONV
 krb5int_mutex_report_stats(k5_mutex_t *m)
 {
 }