[ViewVC] Diff of: cvs/libev/event.c

Comparing libev/event.c (file contents):
Revision 1.46 by root, Sun Oct 24 17:19:47 2010 UTC vs.
Revision 1.48 by root, Wed Nov 10 12:44:22 2010 UTC

 # include EV_EVENT_H
 #else
 # include "event.h"
 #endif
-/* same definition as in ev.c */
-#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
 #if EV_MULTIPLICITY
 # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
 # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
 #else
 # define dLOOPev
 void event_base_free (struct event_base *base)
 {
   dLOOPbase;
 #if EV_MULTIPLICITY
-  if (ev_default_loop (EVFLAG_AUTO) != loop)
+  if (!is_default_loop (loop))
     ev_loop_destroy (loop);
 #endif
 }
 int event_dispatch (void)
   if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
     {
       revents |= EV_TIMEOUT;
       if (tv)
-        EV_TV_SET (tv, ev_now (EV_A)); /* not sure if this is right :) */
+        {
+          ev_tstamp at = ev_now (EV_A);
+          tv->tv_sec  = (long)at;
+          tv->tv_usec = (long)((at - (ev_tstamp)tv->tv_sec) * 1e6);
+        }
     }
   return events & revents;
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines