From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Apr 2011 02:14:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.1-alpha~29^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0130e7c9d2842ad58e1b84829aeab16a2efba3bb;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/common/torint.h
---

0130e7c9d2842ad58e1b84829aeab16a2efba3bb
diff --cc src/common/torint.h
index f5bebf8b9d,d489684656..0b5c29adc0
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@@ -329,8 -330,10 +329,10 @@@ typedef uint32_t uintptr_t
  #endif
  #endif
  
 -/* Any ssize_t larger than this amount is likely to be an underflow. */
++/** Any ssize_t larger than this amount is likely to be an underflow. */
+ #define SSIZE_T_CEILING ((ssize_t)(SSIZE_T_MAX-16))
 -/* Any size_t larger than this amount is likely to be an underflow. */
 +/** Any size_t larger than this amount is likely to be an underflow. */
- #define SIZE_T_CEILING (SSIZE_T_MAX-16)
+ #define SIZE_T_CEILING  ((size_t)(SSIZE_T_MAX-16))
  
  #endif /* __TORINT_H */