From d68da9db1b34dbd6f29a0576bc897a9c49e4d7ed Mon Sep 17 00:00:00 2001 From: root Date: Sun, 4 Nov 2007 16:52:52 +0000 Subject: [PATCH] *** empty log message *** --- ev.c | 6 ++++-- evdns.c | 5 +++-- event.c | 6 ++++-- event.h | 6 ++++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ev.c b/ev.c index 790baee..a80ed9c 100644 --- a/ev.c +++ b/ev.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef EV_STANDALONE +#ifndef EV_EMBED # include "config.h" #endif @@ -95,7 +95,9 @@ #define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ /*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ -#include "ev.h" +#ifndef EV_EMBED +# include "ev.h" +#endif #if __GNUC__ >= 3 # define expect(expr,value) __builtin_expect ((expr),(value)) diff --git a/evdns.c b/evdns.c index 4894401..f71c4f6 100644 --- a/evdns.c +++ b/evdns.c @@ -1,4 +1,4 @@ -/* $Id: evdns.c,v 1.7 2007-11-03 20:24:42 root Exp $ */ +/* $Id: evdns.c,v 1.8 2007-11-04 16:52:52 root Exp $ */ /* The original version of this module was written by Adam Langley; for * a history of modifications, check out the subversion logs. @@ -40,8 +40,10 @@ #endif #ifdef WIN32 +#ifndef EV_EMBED #include "misc.h" #endif +#endif /* #define NDEBUG */ @@ -94,7 +96,6 @@ #include #include "evdns.h" -#include "log.h" #ifdef WIN32 #include #include diff --git a/event.c b/event.c index 6e26a48..83fa711 100644 --- a/event.c +++ b/event.c @@ -34,7 +34,9 @@ #include #include -#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 @@ -110,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 */ diff --git a/event.h b/event.h index d21ed3f..48c34e6 100644 --- a/event.h +++ b/event.h @@ -31,7 +31,9 @@ #ifndef _EVENT_H_ #define _EVENT_H_ -#include "ev.h" +#ifndef EV_EMBED +# include "ev.h" +#endif #ifdef __cplusplus extern "C" { @@ -121,7 +123,7 @@ int event_base_dispatch (struct event_base *base); int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv); int event_base_priority_init (struct event_base *base, int fd); -#ifndef EV_STANDALONE +#ifndef EV_EMBED # include "event_compat.h" #endif -- 2.43.0