summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2011-11-29 15:10:05 +0000
committerroot <root>2011-11-29 15:10:05 +0000
commit1538571fb1f09ace6bcafba2b53c86a1e2881991 (patch)
treeff1e5ec5fa2eb35ba8d6fd35a036d050445a2bc6
parent3c8ea3c5b26a769ea7742b370770f95261eac65b (diff)
*** empty log message ***
-rw-r--r--ev++.h4
-rw-r--r--ev.pod2
2 files changed, 3 insertions, 3 deletions
diff --git a/ev++.h b/ev++.h
index ce42b5f..c5a0896 100644
--- a/ev++.h
+++ b/ev++.h
@@ -517,9 +517,9 @@ namespace ev {
}
};
- inline tstamp now () throw ()
+ inline tstamp now (EV_P) throw ()
{
- return ev_time ();
+ return ev_now (EV_A);
}
inline void delay (tstamp interval) throw ()
diff --git a/ev.pod b/ev.pod
index 6450c61..5701348 100644
--- a/ev.pod
+++ b/ev.pod
@@ -1022,7 +1022,7 @@ each call to a libev function.
However, C<ev_run> can run an indefinite time, so it is not feasible
to wait for it to return. One way around this is to wake up the event
-loop via C<ev_break> and C<av_async_send>, another way is to set these
+loop via C<ev_break> and C<ev_async_send>, another way is to set these
I<release> and I<acquire> callbacks on the loop.
When set, then C<release> will be called just before the thread is