[or-cvs] r14001: Oops, do a better fix for that. (in tor/trunk: . src/common)

[nickm at seul.org]

Author: nickm
Date: 2008-03-13 11:06:49 -0400 (Thu, 13 Mar 2008)
New Revision: 14001

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/common/OpenBSD_malloc_Linux.c
Log:
 r18783 at catbus:  nickm | 2008-03-13 11:06:45 -0400
 Oops, do a better fix for that.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18783] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-03-13 15:06:26 UTC (rev 14000)
+++ tor/trunk/ChangeLog	2008-03-13 15:06:49 UTC (rev 14001)
@@ -19,7 +19,7 @@
       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

Modified: tor/trunk/src/common/OpenBSD_malloc_Linux.c
===================================================================
--- tor/trunk/src/common/OpenBSD_malloc_Linux.c	2008-03-13 15:06:26 UTC (rev 14000)
+++ tor/trunk/src/common/OpenBSD_malloc_Linux.c	2008-03-13 15:06:49 UTC (rev 14001)
@@ -1928,14 +1928,13 @@
 	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