diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-01-14 05:18:31 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-01-14 05:18:31 +0000 |
| commit | ed4f2c0c4b465c85ff2da9fa7a85e13498d3804f (patch) | |
| tree | 0550d672c13b20ad4835510fa63e67bfefbdfcb3 /src/util | |
| parent | c8fcc72982cb9c4718fd520d70e69d3a30c0af15 (diff) | |
| download | krb5-ed4f2c0c4b465c85ff2da9fa7a85e13498d3804f.tar.gz krb5-ed4f2c0c4b465c85ff2da9fa7a85e13498d3804f.tar.xz krb5-ed4f2c0c4b465c85ff2da9fa7a85e13498d3804f.zip | |
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
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/support/ChangeLog | 9 | ||||
| -rw-r--r-- | src/util/support/threads.c | 15 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog index 05a9df936..4e0aaa679 100644 --- 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 67b7e07c5..44b64201f 100644 --- 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) { } |