summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-12 14:38:11 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-12 14:38:11 -0500
commit2c04c506a480d2e7ab39a51c781f811963f30c9c (patch)
tree9e7db1e7e033ab41fb7213ced4126ce2299dd606
parent43e12a79885871cdf18bfe6cc835b2414d21e29d (diff)
parent9fcc14224b689dff1be8336feeeb563199694c27 (diff)
downloadtor-2c04c506a480d2e7ab39a51c781f811963f30c9c.tar.gz
tor-2c04c506a480d2e7ab39a51c781f811963f30c9c.zip
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
-rw-r--r--src/common/torint.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/torint.h b/src/common/torint.h
index f624bff86e..1faf65abab 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -115,7 +115,7 @@ typedef unsigned int uint32_t;
#define UINT32_MAX 0xffffffffu
#endif
#ifndef INT32_MAX
-#define INT32_MAX 0x7fffffffu
+#define INT32_MAX 0x7fffffff
#endif
#ifndef INT32_MIN
#define INT32_MIN (-2147483647-1)