From: Tom Yu <tlyu@mit.edu>
Date: Mon, 31 Oct 2005 22:25:42 +0000 (+0000)
Subject: pull up r17012 from trunk, minus stats update stuff which only affects
X-Git-Tag: krb5-1.4.3-beta2~8
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8880904539ce5c69772938483cf77302dea6ebe5;p=krb5.git

pull up r17012 from trunk, minus stats update stuff which only affects
trunk

ticket: 3227
version_fixed: 1.4.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17472 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index f85a55e24..6c62c9214 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -38,6 +38,13 @@
 	* k5-platform.h (PROGRAM_EXITING) [__GNUC__ && !_WIN32 &&
 	CONSTRUCTOR_ATTR_WORKS]: Define as zero.
 
+2005-01-07  Ken Raeburn  <raeburn@mit.edu>
+
+	* k5-thread.h (KRB5_CALLCONV, KRB5_CALLCONV_C): Define if not
+	defined.
+	(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>
 
         * win-mac.h: define NEED_INSIXADDR_ANY for ipv6 symbol
diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index d750003a0..fa1f63bb4 100644
--- 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
 
 /* 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;