Changeset a830133 in git

Timestamp:

Mar 17, 2009, 10:01:46 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

ab89373cf4c7ae3f8b064a46e9e311cde2fb9322

Parents:

febf7e79089257c80bba7e793dd2fb03af40b285

Message:

*hannes: OMALLOC_USES_MALLOC


git-svn-id: file:///usr/local/Singular/svn/trunk@11565 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• mminit.cc (modified) (2 diffs)
• mmstd.c (modified) (3 diffs)

kernel/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
+/* $Id: mminit.cc,v 1.2 2009-03-17 09:01:46 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -39 +39 @@
   {
 #if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
+    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
+    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
+    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
+    /* do not rely on the default in Singular as libsingular may be different */
     mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
 #else

kernel/mmstd.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmstd.c,v 1.4 2007-03-21 17:45:27 Singular Exp $ */
+/* $Id: mmstd.c,v 1.5 2009-03-17 09:01:46 Singular Exp $ */
 /*
 * ABSTRACT: standard version of C-memory management alloc func 
@@ -11 +11 @@
 
 #define OM_NO_MALLOC_MACROS
-#ifdef ix86_Win
-#define OMALLOC_USES_MALLOC
-#endif
-#ifdef ppcMac_darwin
-#define OMALLOC_USES_MALLOC
-#endif
-#ifdef ix86Mac_darwin
-#define OMALLOC_USES_MALLOC
-#endif
 #include "omalloc.h"
 #include "../Singular/static.h"
@@ -28 +19 @@
 // already provided in libomalloc
 #if !defined(OMALLOC_USES_MALLOC) && !defined(X_OMALLOC) && !defined(HAVE_STATIC)
+    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
+    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
+    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
+    /* do not rely on the default in Singular as libsingular may be different */
 
 // define this so that all addr allocated there are marked