Changeset a2f973 in git


Ignore:
Timestamp:
Dec 8, 2010, 4:15:41 PM (14 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '8c6038b526213d378981739e978a9f7b485dab94')
Children:
20b794b84c950b9228e04900a5ccb47c0926cb2e
Parents:
f769719de615ce331ad5f46a18fe1e75de401f68
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2010-12-08 16:15:41+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:57:47+01:00
Message:
- modified and added omMalloc.h (should not be installed)
- configure.ac no longer generates omMalloc.h
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    rf769719 ra2f973  
    5252omalloc/omConfig.h
    5353omalloc/omExternalConfig.h
    54 omalloc/omMalloc.h
    5554omalloc/omlimits.h
    5655doc/NTL
  • omalloc/configure.ac

    rf769719 ra2f973  
    247247if test "${with_malloc}" = system; then
    248248  OM_MALLOC_HEADER=omMallocSystem.h
    249   AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
     249  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
     250  AC_DEFINE(OMALLOC_USES_SYSTEM_MALLOC,1,use system malloc as system allocator)
    250251  if test "${with_provide_malloc}" = yes || test "${with_provide_malloc}" = debug; then
    251252    AC_MSG_ERROR("can not provide malloc for --with-malloc=system")
    252253  fi
    253254elif test "${with_malloc}" = gmalloc; then
     255  AC_DEFINE(OMALLOC_USES_GMALLOC,1,use gmalloc as system allocator)
    254256  OM_MALLOC_HEADER=gmalloc.h
    255257  OM_MALLOC_SOURCE=gmalloc.c
    256258elif test "${with_malloc}" = pmalloc; then
     259  AC_DEFINE(OMALLOC_USES_PMALLOC,1,use pmalloc as system allocator)
    257260  OM_MALLOC_HEADER=pmalloc.h
    258261  OM_MALLOC_SOURCE=pmalloc.c
     
    264267    AC_MSG_ERROR("can not provide malloc for --with_malloc=external")
    265268  fi
     269  AC_DEFINE(OMALLOC_USES_EXTERNAL_MALLOC,1,use external malloc as system allocator)
    266270  OM_MALLOC_HEADER=$with_external_malloc_h
    267271  OM_MALLOC_SOURCE=$with_external_malloc_c
    268   AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
     272  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
    269273elif test "${with_malloc}" = dlmalloc; then
    270274  with_malloc=dlmalloc
     275  AC_DEFINE(OMALLOC_USES_DLMALLOC,1,use dlmalloc as system allocator)
    271276  OM_MALLOC_HEADER=dlmalloc.h
    272277  OM_MALLOC_SOURCE=dlmalloc.c
    273 else
     278else    ## default
    274279  OM_MALLOC_HEADER=omMallocSystem.h
    275   AC_DEFINE(OMALLOC_USES_MALLOC,1,"Whether omalloc uses malloc ()")
     280  AC_DEFINE(OMALLOC_USES_MALLOC,1,the system allocator is called malloc)
     281  AC_DEFINE(OMALLOC_USES_SYSTEM_MALLOC,1,use system malloc as system allocator)
    276282  if test "${with_provide_malloc}" = yes || test "${with_provide_malloc}" = debug; then
    277283    AC_MSG_ERROR("can not provide malloc for --with-malloc=system")
  • omalloc/pmalloc.h

    rf769719 ra2f973  
    66 *  Version: $Id$
    77 *******************************************************************/
    8 #ifndef OM_MALLOC_SYSTEM_H
    9 #define OM_MALLOC_SYSTEM_H
     8#ifndef OM_PMALLOC_H
     9#define OM_PMALLOC_H
    1010
    1111#include <omalloc/omConfig.h>
     
    3030#define OM_MALLOC_VFREE(addr, size) OM_MALLOC_FREE(addr)
    3131
    32 #endif /* OM_MALLOC_SYSTEM_H */
     32#endif /* OM_PMALLOC_H */
Note: See TracChangeset for help on using the changeset viewer.