diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
| commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
| tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/common/compat_libevent.h | |
| parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.c
Diffstat (limited to 'src/common/compat_libevent.h')
| -rw-r--r-- | src/common/compat_libevent.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index ecf25806d..496544d00 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -12,11 +12,15 @@ struct event_base; struct bufferevent; #endif + #ifdef HAVE_EVENT2_EVENT_H #include <event2/util.h> #else +#ifndef EVUTIL_SOCKET_DEFINED +#define EVUTIL_SOCKET_DEFINED #define evutil_socket_t int #endif +#endif void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); |