*** empty log message ***

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 75cd06b87a6103d791a5d688b617b3d8462185fe..83fa71103bb45f99318f6de4cf75fc4b2f37899b 100644 (file)
--- a/event.c
+++ b/event.c
@@ -32,8 +32,11 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <assert.h>
 
-#include "event.h"
+#ifndef EV_EMBED
+# include "event.h"
+#endif
 
 #if EV_MULTIPLICITY
 # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
@@ -49,7 +52,7 @@ struct event_base
   int dummy;
 };
 
-static struct event_base x_base, *x_cur;
+static struct event_base *x_cur;
 
 static void
 tv_set (struct timeval *tv, ev_tstamp at)
@@ -82,9 +85,14 @@ const char *event_get_method (void)
 void *event_init (void)
 {
 #if EV_MULTIPLICITY
-  x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+  if (x_cur)
+    x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+  else
+    x_cur = ev_default_loop (EVMETHOD_AUTO);
 #else
-  x_cur = &x_base;
+  assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
+
+  x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
 #endif
 
   return x_cur;
@@ -104,7 +112,7 @@ int event_dispatch (void)
   return event_base_dispatch (x_cur);
 }
 
-#ifdef EV_STANDALONE
+#ifdef EV_EMBED
 void event_set_log_callback (event_log_cb cb)
 {
   /* nop */