Fix some compilation issues.

diff --git a/src/common/compat.c b/src/common/compat.c
index 91d117d7b5e635f02b7757975f285b554641ff24..74de9a5d1b4e9bf4bdca55c8ceec34ec059e7df3 100644 (file)
--- 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) {

diff --git a/src/ext/include.am b/src/ext/include.am
index f0bfbb791f661aa54783cf76bc887f5548510fd5..40923aa93e3cef0d54eaa37f7ec3cae1ccc9ca85 100644 (file)
--- a/src/ext/include.am
+++ b/src/ext/include.am
@@ -7,7 +7,7 @@ EXTHEADERS = \
   src/ext/ht.h         \
   src/ext/eventdns.h   \
   src/ext/tinytest.h   \
-  src/ext/readpassphrase.h \
+  src/ext/tor_readpassphrase.h \
   src/ext/strlcat.c    \
   src/ext/strlcpy.c    \
   src/ext/tinytest_macros.h \

diff --git a/src/ext/readpassphrase.h b/src/ext/tor_readpassphrase.h
similarity index 100%
rename from src/ext/readpassphrase.h
rename to src/ext/tor_readpassphrase.h