From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 May 2016 18:51:38 +0000 (-0400)
Subject: Fix a compiler warning on windows when sizeof(long)==sizeof(int)
X-Git-Tag: tor-0.2.9.1-alpha~242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44cbd00dfaba8314dea274d5c4535adc3c202220;p=thirdparty%2Ftor.git

Fix a compiler warning on windows when sizeof(long)==sizeof(int)
---

diff --git a/src/common/util.c b/src/common/util.c
index d290f545a0..d1c8b2ee4c 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3273,8 +3273,10 @@ tor_vsscanf(const char *buf, const char *pattern, va_list ap)
           *out = lng;
         } else {
           int *out = va_arg(ap, int *);
+#if LONG_MAX > INT_MAX
           if (lng < INT_MIN || lng > INT_MAX)
             return n_matched;
+#endif
           *out = (int)lng;
         }
         ++pattern;