* do no longer include timeval.h in watch.h by default

[catta] / avahi-common / simple-watch.c

diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index 6531fb773859dc0d7816908de6cfc1531b52ca23..36335215088f2f0563e5e377e496cb0044010e8d 100644 (file)
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <avahi-common/llist.h>
-#include <avahi-common/malloc.h>
-
+#include "llist.h"
+#include "malloc.h"
+#include "timeval.h"
 #include "simple-watch.h"
 
 struct AvahiWatch {
@@ -519,7 +519,7 @@ finish:
 
 int avahi_simple_poll_run(AvahiSimplePoll *s) {
     assert(s);
-    assert(s->state == STATE_PREPARED);
+    assert(s->state == STATE_PREPARED || s->state == STATE_FAILURE);
     
     s->state = STATE_RUNNING;