From 625d1dd4f4b8b898e99028cdd4a3c2982b6ce6bd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 26 Oct 2005 06:46:36 +0000
Subject: [PATCH] fix isc_timer_gettype return type

---
 lib/isc/include/isc/timer.h | 11 +++++++++--
 lib/isc/timer.c             |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index 22e920aec4..36b3aa3ebc 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.h,v 1.33 2005/04/29 00:23:46 marka Exp $ */
+/* $Id: timer.h,v 1.34 2005/10/26 06:46:36 marka Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1
@@ -276,8 +276,15 @@ isc_timer_detach(isc_timer_t **timerp);
  *\endcode
  */
 
-isc_result_t
+isc_timertype_t
 isc_timer_gettype(isc_timer_t *timer);
+/*%<
+ * Return the timer type.
+ *
+ * Requires:
+ *
+ *\li	'timer' to be a valid timer.
+ */
 
 isc_result_t
 isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp);
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 865bb9264d..e766165f2d 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.76 2005/07/12 01:00:18 marka Exp $ */
+/* $Id: timer.c,v 1.77 2005/10/26 06:46:36 marka Exp $ */
 
 /*! \file */
 
@@ -486,7 +486,7 @@ isc_timer_reset(isc_timer_t *timer, isc_timertype_t type,
 	return (result);
 }
 
-isc_result_t
+isc_timertype_t
 isc_timer_gettype(isc_timer_t *timer) {
 	isc_timertype_t t;