[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm at torproject.org]

commit 0130e7c9d2842ad58e1b84829aeab16a2efba3bb
Merge: 7f85509 43ffd02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 27 22:14:28 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Conflicts:
    	src/common/torint.h

 changes/bug2475     |    5 +++++
 src/common/crypto.c |    2 +-
 src/common/torint.h |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --cc src/common/torint.h
index f5bebf8,d489684..0b5c29a
--- 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 */