diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-27 14:27:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-27 14:27:00 -0400 |
| commit | 229bb7e50f1df1953f07f9447cf2634166745431 (patch) | |
| tree | e4f6121f44685fd4ff66bd86994982521f6a7aa8 /src/common/compat.c | |
| parent | 48f69685f5df3ca0f39a3da155df3b9a5cfa2b99 (diff) | |
| download | tor-229bb7e50f1df1953f07f9447cf2634166745431.tar.gz tor-229bb7e50f1df1953f07f9447cf2634166745431.zip | |
Fix some compilation issues.
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 91d117d7b5..74de9a5d1b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -70,7 +70,7 @@ #ifdef HAVE_READPASSPHRASE_H #include <readpassphrase.h> #elif !defined(_WIN32) -#include "readpassphrase.h" +#include "tor_readpassphrase.h" #else #include <conio.h> #endif @@ -1650,7 +1650,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) } /* Set the current limit value so if the attempt to set the limit to the * max fails at least we'll have a valid value of maximum sockets. */ - max_sockets = rlim.rlim_cur - ULIMIT_BUFFER; + max_sockets = (int)rlim.rlim_cur - ULIMIT_BUFFER; rlim.rlim_cur = rlim.rlim_max; if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { |