* k5-thread.h (KRB5_CALLCONV, KRB5_CALLCONV_C): Define if not defined.

(krb5int_mutx_lock_update_stats, krb5int_mutex_unlock_update_stats,
krb5int_mutex_report_stats) [!DEBUG_THREADS_STATS]: Declare, with KRB5_CALLCONV.
(k5_debug_make_loc): Change "lineno" to type int.
(k5_debug_make_loc): Likewise for argument "line".

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 2df928059c50014c870b3882e737e2de0c8b545b..21ac13728ca1e7301d59d35662d48f1d469521f8 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-07  Ken Raeburn  <raeburn@mit.edu>
+
+       * k5-thread.h (KRB5_CALLCONV, KRB5_CALLCONV_C): Define if not
+       defined.
+       (krb5int_mutx_lock_update_stats,
+       krb5int_mutex_unlock_update_stats, krb5int_mutex_report_stats)
+       [!DEBUG_THREADS_STATS]: Declare, with KRB5_CALLCONV.
+       (k5_debug_make_loc): Change "lineno" to type int.
+       (k5_debug_make_loc): Likewise for argument "line".
+
 2005-01-04  Jeffrey Altman <jaltman@mit.edu>
 
         * krb5.hin: add prototype for krb5_is_thread_safe

diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index 88b6bf3b9a8de1a31caf6b3a2f721c80db2f49c3..2d8c03413d122007504a765eb46eb44498862f92 100644 (file)
--- a/src/include/k5-thread.h
+++ b/src/include/k5-thread.h
@@ -31,6 +31,12 @@
 #define K5_THREAD_H
 
 #include "autoconf.h"
+#ifndef KRB5_CALLCONV
+# define KRB5_CALLCONV
+#endif
+#ifndef KRB5_CALLCONV_C
+# define KRB5_CALLCONV_C
+#endif
 
 \f/* Interface (tentative):
 
@@ -148,13 +154,13 @@
 #ifdef DEBUG_THREADS_LOC
 typedef struct {
     const char *filename;
-    short lineno;
+    int lineno;
 } k5_debug_loc;
 #define K5_DEBUG_LOC_INIT      { __FILE__, __LINE__ }
 #if __GNUC__ >= 2
 #define K5_DEBUG_LOC           (__extension__ (k5_debug_loc)K5_DEBUG_LOC_INIT)
 #else
-static inline k5_debug_loc k5_debug_make_loc(const char *file, short line)
+static inline k5_debug_loc k5_debug_make_loc(const char *file, int line)
 {
     k5_debug_loc l;
     l.filename = file;
@@ -243,6 +249,14 @@ typedef int k5_mutex_stats_tmp;
 #define k5_mutex_stats_start()         (0)
 #define k5_mutex_lock_update_stats(M,S)        (S)
 #define k5_mutex_unlock_update_stats(M)        (*(M) = 's')
+
+/* If statistics tracking isn't enabled, these functions don't actually
+   do anything.  Declare anyways so we can do type checking etc.  */
+void KRB5_CALLCONV krb5int_mutex_lock_update_stats(k5_debug_mutex_stats *m,
+                                                  k5_mutex_stats_tmp start);
+void KRB5_CALLCONV krb5int_mutex_unlock_update_stats(k5_debug_mutex_stats *m);
+void KRB5_CALLCONV krb5int_mutex_report_stats(/* k5_mutex_t *m */);
+
 #define krb5int_mutex_report_stats(M)  ((M)->stats = 'd')
 
 #endif