diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 22:32:12 -0500 |
| commit | b998431a33db2be0246f176ea0077b98d5258866 (patch) | |
| tree | d03935b5fbc9e8f6327af93b2897fc1f34d931fe /src/common/torint.h | |
| parent | 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 (diff) | |
| parent | b7cf7bd9ae31aeddd03ad2094dd480d2b1d34d4f (diff) | |
| download | tor-b998431a33db2be0246f176ea0077b98d5258866.tar.gz tor-b998431a33db2be0246f176ea0077b98d5258866.zip | |
Merge branch '024_msvc_squashed'
Conflicts:
src/or/or.h
srcwin32/orconfig.h
Diffstat (limited to 'src/common/torint.h')
| -rw-r--r-- | 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 8681eb7457..a993d7649a 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." |