Bladeren bron

r18781@catbus: nickm | 2008-03-13 11:00:51 -0400
Have OpenBSD_malloc_Linux.c use SIZE_T_MAX from torint.h, instead of checking cpu macros. There is always one more cpu you havent checked for.


svn:r14000

Nick Mathewson 17 jaren geleden
bovenliggende
commit
ac6cc43047
2 gewijzigde bestanden met toevoegingen van 8 en 0 verwijderingen
  1. 2 0
      ChangeLog
  2. 6 0
      src/common/OpenBSD_malloc_Linux.c

+ 2 - 0
ChangeLog

@@ -18,6 +18,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
       (sometimes) to buffer data for the network.  Looking at different BIOs
       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.
 
   o Minor features:
     - Allow separate log levels to be configured for different logging

+ 6 - 0
src/common/OpenBSD_malloc_Linux.c

@@ -54,6 +54,8 @@
 #include <limits.h>
 #include <errno.h>
 #include <err.h>
+/* For SIZE_T_MAX */
+#include "torint.h"
 
 //#include "thread_private.h"
 
@@ -1926,12 +1928,16 @@ 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
+#define SIZE_MAX SIZE_T_MAX
+#endif
 
 void *
 calloc(size_t num, size_t size)