From 031c21277637f6a9c287b5118348d82a966d5fee Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 22 Feb 2008 03:26:35 +0000 Subject: r18360@catbus: nickm | 2008-02-21 22:26:32 -0500 Make torint.h define ssize_t more robustly; add spaces to last patch svn:r13670 --- src/common/torint.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/common/torint.h') diff --git a/src/common/torint.h b/src/common/torint.h index e6f3180e96..6f515495d1 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -42,11 +42,6 @@ #include #endif -#ifdef MS_WINDOWS -/* Windows likes to capitalize ssize_t. Charming. */ -#define ssize_t SSIZE_T -#endif - #if (SIZEOF_INT8_T != 0) #define HAVE_INT8_T #endif @@ -186,6 +181,16 @@ typedef unsigned __int64 uint64_t; #endif #endif +#ifndef HAVE_SSIZE_T +#if SIZEOF_SIZE_T == 8 +typedef int64_t ssize_t; +#elif SIZEOF_SIZE_T == 4 +typedef int32_t ssize_t; +#else +#error "Can't define ssize_t." +#endif +#endif + #if (SIZEOF_VOID_P > 4 && SIZEOF_VOID_P <= 8) #ifndef HAVE_INTPTR_T typedef int64_t intptr_t; -- cgit v1.2.3-54-g00ecf