Changeset 672783 in git for kernel/mminit.cc

Timestamp:

Jul 28, 2009, 4:59:52 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

7b87efd89885ee6835475300c291481f6c035bb7

Parents:

a07e45cfc61927c5711cee673474fb891d4574ac

Message:

*hannes: restore old version


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

File:

• kernel/mminit.cc (modified) (2 diffs)

kernel/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.5 2009-07-28 14:15:05 Singular Exp $ */
+/* $Id: mminit.cc,v 1.6 2009-07-28 14:59:30 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -38 +38 @@
   if(mmIsInitialized==0)
   {
+#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
+    mp_set_memory_functions(malloc,reallocSize,freeSize);
+#endif
     om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;
 #ifndef OM_NDEBUG