diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-13 15:06:49 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-13 15:06:49 +0000 |
| commit | cad3d651d07fcf12a69188a934fa408956052b32 (patch) | |
| tree | 13c7b5696f6fe095b53c25f54c46964258faa6f7 | |
| parent | ac6cc430473f6a43c2b26cf88131a0339c67b66a (diff) | |
| download | tor-cad3d651d07fcf12a69188a934fa408956052b32.tar.gz tor-cad3d651d07fcf12a69188a934fa408956052b32.zip | |
r18783@catbus: nickm | 2008-03-13 11:06:45 -0400
Oops, do a better fix for that.
svn:r14001
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/common/OpenBSD_malloc_Linux.c | 15 |
2 files changed, 8 insertions, 9 deletions
@@ -19,7 +19,7 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? could result in write counts on the order of ULONG_MAX. Fix for bug 614. Bugfix on 0.1.2.x. - Make --enable-openbsd-malloc work correctly on Linux with alpha CPUs. - Bugfix on 0.2.0.x. + Fixes bug 625. Bugfix on 0.2.0.x. o Minor features: - Allow separate log levels to be configured for different logging diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index a0817a7a04..59c2c7def1 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -1928,14 +1928,13 @@ realloc(void *ptr, size_t size) return (r); } -#if 0 -#if defined(__i386__)||defined(__arm__)||defined(__powerpc__) -#define SIZE_MAX 0xffffffff -#endif -#if defined(__x86_64__) -#define SIZE_MAX 0xffffffffffffffff -#endif -#else +#ifndef SIZE_MAX +//#if defined(__i386__)||defined(__arm__)||defined(__powerpc__) +//#define SIZE_MAX 0xffffffff +//#endif +//#if defined(__x86_64__) +//#define SIZE_MAX 0xffffffffffffffff +//#endif #define SIZE_MAX SIZE_T_MAX #endif |