pullup from trunk

ticket: 2963
version_fixed: 1.4.1

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

diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index d79cf15448706d1d97aa7b9acbe7e939e9cf374c..d32fd8ac3fe9c4b8f52f7887d2091d7fe630bf8e 100644 (file)
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-15  Jeffrey Altman <jaltman@mit.edu>
+
+        * tktlist.c: do not mix pointers to long and time_t 
+
 2004-09-30  Jeffrey Altman <jaltman@mit.edu>
 
         * Makefile.in: add $(BUILDTOP) to include path for patchlevel.h

diff --git a/src/windows/cns/tktlist.c b/src/windows/cns/tktlist.c
index 5e1520120b21c4b735ffab0ff8a1c2bbc34db14f..68a6f1c6297f7cc659202476210600a7384ee3ef 100644 (file)
--- a/src/windows/cns/tktlist.c
+++ b/src/windows/cns/tktlist.c
@@ -56,7 +56,7 @@ typedef struct {
  * Returns: A pointer to the adjusted time value.
  */
 static char *
-short_date (long t)
+short_date (time_t t)
 {
   static char buf[26 - 4];
   char *p;