Changeset a830133 in git


Ignore:
Timestamp:
Mar 17, 2009, 10:01:46 AM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/mminit.cc

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

    rfebf7e ra830133  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mmstd.c,v 1.4 2007-03-21 17:45:27 Singular Exp $ */
     4/* $Id: mmstd.c,v 1.5 2009-03-17 09:01:46 Singular Exp $ */
    55/*
    66* ABSTRACT: standard version of C-memory management alloc func
     
    1111
    1212#define OM_NO_MALLOC_MACROS
    13 #ifdef ix86_Win
    14 #define OMALLOC_USES_MALLOC
    15 #endif
    16 #ifdef ppcMac_darwin
    17 #define OMALLOC_USES_MALLOC
    18 #endif
    19 #ifdef ix86Mac_darwin
    20 #define OMALLOC_USES_MALLOC
    21 #endif
    2213#include "omalloc.h"
    2314#include "../Singular/static.h"
     
    2819// already provided in libomalloc
    2920#if !defined(OMALLOC_USES_MALLOC) && !defined(X_OMALLOC) && !defined(HAVE_STATIC)
     21    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
     22    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
     23    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
     24    /* do not rely on the default in Singular as libsingular may be different */
    3025
    3126// define this so that all addr allocated there are marked
Note: See TracChangeset for help on using the changeset viewer.