diff options
| author | Richard Nyberg <rnyberg@murmeldjur.se> | 2007-02-25 17:34:12 +0000 |
|---|---|---|
| committer | Richard Nyberg <rnyberg@murmeldjur.se> | 2007-02-25 17:34:12 +0000 |
| commit | 91f85c222be7ef247c8f2e18815eb23c336ed081 (patch) | |
| tree | e622ff381949cdbda284550f1fb701e29b0eba76 /libevent/event.h | |
| parent | 372cec7b53ce0959ba5756e1e51f1f15793a3663 (diff) | |
| download | btpd-91f85c222be7ef247c8f2e18815eb23c336ed081.tar.gz btpd-91f85c222be7ef247c8f2e18815eb23c336ed081.zip | |
Update to libevent from patches-1.3 r335.
Diffstat (limited to 'libevent/event.h')
| -rw-r--r-- | libevent/event.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libevent/event.h b/libevent/event.h index bd370f8..65741d4 100644 --- a/libevent/event.h +++ b/libevent/event.h @@ -38,6 +38,7 @@ extern "C" { #include <windows.h> #undef WIN32_LEAN_AND_MEAN typedef unsigned char u_char; +typedef unsigned short u_short; #endif #define EVLIST_TIMEOUT 0x01 @@ -191,7 +192,7 @@ void event_active(struct event *, int, short); int event_pending(struct event *, short, struct timeval *); #ifdef WIN32 -#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT && (ev)->ev_fd != INVALID_HANDLE_VALUE) +#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT && (ev)->ev_fd != (int)INVALID_HANDLE_VALUE) #else #define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT) #endif @@ -259,6 +260,7 @@ struct bufferevent { struct bufferevent *bufferevent_new(int fd, evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg); +int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev); int bufferevent_priority_set(struct bufferevent *bufev, int pri); void bufferevent_free(struct bufferevent *bufev); int bufferevent_write(struct bufferevent *bufev, void *data, size_t size); @@ -277,7 +279,7 @@ void bufferevent_settimeout(struct bufferevent *bufev, struct evbuffer *evbuffer_new(void); void evbuffer_free(struct evbuffer *); int evbuffer_expand(struct evbuffer *, size_t); -int evbuffer_add(struct evbuffer *, void *, size_t); +int evbuffer_add(struct evbuffer *, const void *, size_t); int evbuffer_remove(struct evbuffer *, void *, size_t); char *evbuffer_readline(struct evbuffer *); int evbuffer_add_buffer(struct evbuffer *, struct evbuffer *); |