summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2012-02-12 08:38:31 +0000
committerroot <root>2012-02-12 08:38:31 +0000
commita2c0bdedd457919c28052570fc6d65ce1ee600ca (patch)
treed9aa8c6289447372c39f20c00609ca1270dbb9b4
parentcfc8bb62da40ad66cead6027ec3c4d10e3bb54a5 (diff)
undef ev_error
-rw-r--r--Changes3
-rw-r--r--ev_kqueue.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/Changes b/Changes
index c664503..dd274f8 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,9 @@ Revision history for libev, a high-performance and full-featured event loop.
TODO: ev_loop_wakeup
TODO: EV_STANDALONE == NO_HASSEL (do not use clock_gettime in ev_standalone)
+ - ev_once: undef EV_ERROR in ev_kqueue.c, to avoid clashing with
+ libev's EV_ERROR (reported by 191919).
+
4.11 Sat Feb 4 19:52:39 CET 2012
- INCOMPATIBLE CHANGE: ev_timer_again now clears the pending status, as
was documented already, but not implemented in the repeating case.
diff --git a/ev_kqueue.c b/ev_kqueue.c
index 91b85ed..5f29bca 100644
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -196,3 +196,6 @@ kqueue_fork (EV_P)
fd_rearm_all (EV_A);
}
+/* sys/event.h defines EV_ERROR */
+#undef EV_ERROR
+