diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat_libevent.h | 5 | ||||
| -rw-r--r-- | src/common/util.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 496544d005..8669fd4e0b 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -12,15 +12,12 @@ struct event_base; struct bufferevent; #endif - #ifdef HAVE_EVENT2_EVENT_H #include <event2/util.h> -#else -#ifndef EVUTIL_SOCKET_DEFINED +#elif !defined(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); diff --git a/src/common/util.h b/src/common/util.h index 4495c02232..2974ab7538 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -276,7 +276,7 @@ typedef struct ratelim_t { char *rate_limit_log(ratelim_t *lim, time_t now); /* File helpers */ -ssize_t write_all(tor_socket_t fd, const char *buf, size_t count, int isSocket); +ssize_t write_all(tor_socket_t fd, const char *buf, size_t count,int isSocket); ssize_t read_all(tor_socket_t fd, char *buf, size_t count, int isSocket); /** Return values from file_status(); see that function's documentation |