From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 27 Jun 2015 18:27:00 +0000 (-0400)
Subject: Fix some compilation issues.
X-Git-Tag: tor-0.2.7.2-alpha~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=229bb7e50f1df1953f07f9447cf2634166745431;p=thirdparty%2Ftor.git

Fix some compilation issues.
---

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) {
diff --git a/src/ext/include.am b/src/ext/include.am
index f0bfbb791f..40923aa93e 100644
--- 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