diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:30:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-25 11:30:52 -0400 |
| commit | 3149bfc254025485496cb6959d4efb5331612cec (patch) | |
| tree | 37c3e084ac450d5e032f8dfce59ced3fb18183b8 /src/common/compat.h | |
| parent | bd731683070351d640e40f1a4d6320e0fe4b727e (diff) | |
| parent | 699acd8d54bd685b135d3a8e758d05dd0802b820 (diff) | |
| download | tor-3149bfc254025485496cb6959d4efb5331612cec.tar.gz tor-3149bfc254025485496cb6959d4efb5331612cec.zip | |
Merge branch 'bug16288_027_03_squashed'
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 549ed827d4..e1b860f229 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -580,7 +580,7 @@ int network_init(void); #define ERRNO_IS_ACCEPT_EAGAIN(e) ERRNO_IS_EAGAIN(e) /** Return true if e is EMFILE or another error indicating that a call to * accept() has failed because we're out of fds or something. */ -#define ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e) \ +#define ERRNO_IS_RESOURCE_LIMIT(e) \ ((e) == WSAEMFILE || (e) == WSAENOBUFS) /** Return true if e is EADDRINUSE or the local equivalent. */ #define ERRNO_IS_EADDRINUSE(e) ((e) == WSAEADDRINUSE) @@ -598,7 +598,7 @@ const char *tor_socket_strerror(int e); #define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS || 0) #define ERRNO_IS_ACCEPT_EAGAIN(e) \ (ERRNO_IS_EAGAIN(e) || (e) == ECONNABORTED) -#define ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e) \ +#define ERRNO_IS_RESOURCE_LIMIT(e) \ ((e) == EMFILE || (e) == ENFILE || (e) == ENOBUFS || (e) == ENOMEM) #define ERRNO_IS_EADDRINUSE(e) (((e) == EADDRINUSE) || 0) #define tor_socket_errno(sock) (errno) |