From b0dcf01e07c8b661c308755f83cd2d0ac351189a Mon Sep 17 00:00:00 2001
From: root <root>
Date: Tue, 24 Jan 2012 16:37:12 +0000
Subject: *** empty log message ***

---
 Changes | 4 +++-
 ev.c    | 2 ++
 ev.pod  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index cee7d45..662572a 100644
--- a/Changes
+++ b/Changes
@@ -4,7 +4,9 @@ TODO: ev_loop_wakeup
 
 TODO: EV_NO_THREADS/NO_SMP and/or EV_USE_PTHREADS or so. also document.
 TODO: EV_STANDALONE == NO_HASSEL (do not use clock_gettime in ev_standalone)
-4.10
+4.11
+	- INCOMPATIBLE CHANGE: ev_timer_again now clears the pending status, as
+          was documented already, but not implemented in the repeating case.
 	- fix a race where the workaround against the epoll fork bugs
           caused signals to not be handled anymore.
 	- correct backend_fudge for most backends, and implement a windows
diff --git a/ev.c b/ev.c
index 45996f1..82e663f 100644
--- a/ev.c
+++ b/ev.c
@@ -3301,6 +3301,8 @@ ev_timer_again (EV_P_ ev_timer *w)
 {
   EV_FREQUENT_CHECK;
 
+  clear_pending (EV_A_ w);
+
   if (ev_is_active (w))
     {
       if (w->repeat)
diff --git a/ev.pod b/ev.pod
index 1f6aabb..9a4f187 100644
--- a/ev.pod
+++ b/ev.pod
@@ -2114,7 +2114,7 @@ This will act as if the timer timed out, and restarts it again if it is
 repeating. It basically works like calling C<ev_timer_stop>, updating the
 timeout to the C<repeat> value and calling C<ev_timer_start>.
 
-The exact semantics are as in the wollofing rules, all of which will be
+The exact semantics are as in the following rules, all of which will be
 applied to the watcher:
 
 =over 4
-- 
cgit v1.2.3