[tor-commits] [tor/master] Define SIZEOF_INTPTR_T when defining replacement intptr_t

nickm at torproject.org nickm at torproject.org
Thu Jan 17 03:32:41 UTC 2013


commit 0102aaeb6b513fb40fef51103780fe121e13f549
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:10:16 2012 -0500

    Define SIZEOF_INTPTR_T when defining replacement intptr_t
    
    Fixes bug 7669
---
 src/common/torint.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/common/torint.h b/src/common/torint.h
index 0db9cc7..1d76ee6 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -214,16 +214,20 @@ typedef int32_t ssize_t;
 #if (SIZEOF_VOID_P > 4 && SIZEOF_VOID_P <= 8)
 #ifndef HAVE_INTPTR_T
 typedef int64_t intptr_t;
+#define SIZEOF_INTPTR_T 8
 #endif
 #ifndef HAVE_UINTPTR_T
 typedef uint64_t uintptr_t;
+#define SIZEOF_UINTPTR_T 8
 #endif
 #elif (SIZEOF_VOID_P > 2 && SIZEOF_VOID_P <= 4)
 #ifndef HAVE_INTPTR_T
 typedef int32_t intptr_t;
+#define SIZEOF_INTPTR_T 4
 #endif
 #ifndef HAVE_UINTPTR_T
 typedef uint32_t uintptr_t;
+#define SIZEOF_UINTPTR_T 4
 #endif
 #else
 #error "void * is either >8 bytes or <= 2.  In either case, I am confused."





More information about the tor-commits mailing list