diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
| commit | da7c60dcf310fb9914bfd1b84a34b440ab04900a (patch) | |
| tree | 1a30bd8ef9e3473a45a5c72c538afceae9233412 /src/common/compat_libevent.h | |
| parent | 6802499413f8efd98ad4d578e5ef937cb55c1edc (diff) | |
| parent | cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd (diff) | |
| download | tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar.gz tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.zip | |
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
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 fdf5e0a18f..1decc8d5f9 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -9,11 +9,15 @@ struct event; struct event_base; + #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); |