extern "C" guard for header file.

assert activeq in event.c;

from Phil Oelson.



svn:r313
This commit is contained in:
Niels Provos 2007-01-27 04:06:52 +00:00
parent b04043ae51
commit 4922f342fc
2 changed files with 10 additions and 0 deletions

View File

@ -237,6 +237,10 @@
#ifndef EVENTDNS_H #ifndef EVENTDNS_H
#define EVENTDNS_H #define EVENTDNS_H
#ifdef __cplusplus
extern "C" {
#endif
/* Error codes 0-5 are as described in RFC 1035. */ /* Error codes 0-5 are as described in RFC 1035. */
#define DNS_ERR_NONE 0 #define DNS_ERR_NONE 0
/* The name server was unable to interpret the query */ /* The name server was unable to interpret the query */
@ -303,4 +307,8 @@ void evdns_set_log_fn(evdns_debug_log_fn_type fn);
#define DNS_NO_SEARCH 1 #define DNS_NO_SEARCH 1
#ifdef __cplusplus
}
#endif
#endif // !EVENTDNS_H #endif // !EVENTDNS_H

View File

@ -301,6 +301,8 @@ event_process_active(struct event_base *base)
} }
} }
assert(activeq != NULL);
for (ev = TAILQ_FIRST(activeq); ev; ev = TAILQ_FIRST(activeq)) { for (ev = TAILQ_FIRST(activeq); ev; ev = TAILQ_FIRST(activeq)) {
event_queue_remove(base, ev, EVLIST_ACTIVE); event_queue_remove(base, ev, EVLIST_ACTIVE);