summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2010-03-16 20:48:29 +0000
committerroot <root>2010-03-16 20:48:29 +0000
commit3c7637cfb1509f288675f32325e3e9027b9f5ca9 (patch)
tree786ae71d1a9339a3bcced01727b66d9d01dd9c0e
parentbfe44fe60eda20fb8a3e6efb10b08cb26d203a7c (diff)
*** empty log message ***
-rw-r--r--ev.c4
-rw-r--r--ev.h11
2 files changed, 8 insertions, 7 deletions
diff --git a/ev.c b/ev.c
index 727b7bc..a22809a 100644
--- a/ev.c
+++ b/ev.c
@@ -2098,7 +2098,7 @@ timers_reify (EV_P)
}
while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
- feed_reverse_done (EV_A_ EV_TIMEOUT);
+ feed_reverse_done (EV_A_ EV_TIMER);
}
}
@@ -3638,7 +3638,7 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
if (expect_false (!once))
{
- cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+ cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
return;
}
diff --git a/ev.h b/ev.h
index 16e175b..20dbc10 100644
--- a/ev.h
+++ b/ev.h
@@ -187,8 +187,8 @@ struct ev_loop;
#define EV_WRITE 0x02 /* ev_io detected write will not block */
#define EV__IOFDSET 0x80 /* internal use only */
#define EV_IO EV_READ /* alias for type-detection */
-#define EV_TIMEOUT 0x00000100 /* timer timed out */
-#define EV_TIMER EV_TIMEOUT /* alias for type-detection */
+#define EV_TIMER 0x00000100 /* timer timed out */
+#define EV_TIMEOUT EV_TIMER /* pre 4.0 API compatibility */
#define EV_PERIODIC 0x00000200 /* periodic timer timed out */
#define EV_SIGNAL 0x00000400 /* signal was received */
#define EV_CHILD 0x00000800 /* child/pid had status change */
@@ -594,10 +594,11 @@ unsigned int ev_iteration (EV_P); /* number of loop iterations */
unsigned int ev_depth (EV_P); /* #ev_loop enters - #ev_loop leaves */
void ev_verify (EV_P); /* abort if loop data corrupted */
-/* pre 4.0 API */
+/* pre 4.0 API compatibility */
# if EV_MULTIPLICITY
-# define ev_loop_count(l) ev_iteration (l)
-# define ev_loop_depth(l) ev_depth (l)
+# define ev_loop_count(l) ev_iteration (l)
+# define ev_loop_depth(l) ev_depth (l)
+# define ev_loop_verify(l) ev_verify (l)
# endif
void ev_set_io_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */