]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
r16450@catbus: nickm | 2007-11-06 09:18:11 -0500
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2007 14:19:14 +0000 (14:19 +0000)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2007 14:19:14 +0000 (14:19 +0000)
 Fix compile on sparc64

svn:r12394

src/common/compat.c

index e556257a64ae1f9ac5df9840bf086d4184db100a..6a5d2abba6f3753bb7faf1b6aa70d01c351f1814 100644 (file)
@@ -708,7 +708,7 @@ set_max_file_descriptors(unsigned long limit, unsigned long cap)
     return -1;
   }
   most = rlim.rlim_max > (rlim_t)cap ? (rlim_t)cap : rlim.rlim_max;
-  if (most > (unsigned long)rlim.rlim_cur) {
+  if ((rlim_t)most > rlim.rlim_cur) {
     log_info(LD_NET,"Raising max file descriptors from %lu to %lu.",
              (unsigned long)rlim.rlim_cur, (unsigned long)most);
   }
@@ -722,7 +722,7 @@ set_max_file_descriptors(unsigned long limit, unsigned long cap)
        * full of nasty lies.  I'm looking at you, OSX 10.5.... */
       rlim.rlim_cur = OPEN_MAX;
       if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) {
-        if (rlim.rlim_cur < limit) {
+        if (rlim.rlim_cur < (rlim_t)limit) {
           log_warn(LD_CONFIG, "We are limited to %lu file descriptors by "
                  "OPEN_MAX, and ConnLimit is %lu.  Changing ConnLimit; sorry.",
                    (unsigned long)OPEN_MAX, limit);