Changeset 0642d6 in git for omalloc/omAllocDecl.h

Timestamp:

Apr 7, 2011, 11:43:46 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7c230ff8e2d24453069aa4a9c80d882e8f9266d2

Parents:

830ef89e5dc0be692aac1a170b5523278b45caba

Message:

omcalloc not needed

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

File:

• omalloc/omAllocDecl.h (modified) (4 diffs)

omalloc/omAllocDecl.h

@@ -21 +21 @@
 
 
-#if !defined(OMALLOC_C) && !defined(OM_NO_MALLOC_MACROS)
-#define calloc      omcalloc
-#define malloc      omalloc
-#define free        omfree
-#define realloc     omrealloc
-#define freeSize    omfreeSize
-#define reallocSize omreallocSize
-#endif
-
 #if (!defined(OM_EMULATE_OMALLOC) && !defined(OM_NDEBUG) && (defined(OM_CHECK) || (defined(OM_HAVE_TRACK) && defined(OM_TRACK)))) || defined(OM_T1)
 
@@ -63 +54 @@
 #define omalloc(size)   _omDebugAlloc((void*)(size),OM_FSIZE|OM_FSLOPPY|OM_FALIGN|_OM_FKEEP,OM_CTFL)
 #define omalloc0(size)  _omDebugAlloc((void*)(size),OM_FSIZE|OM_FZERO|OM_FSLOPPY|OM_FALIGN|_OM_FKEEP,OM_CTFL)
-#define omcalloc(n,size)_omDebugAlloc((void*) ((size)*n),OM_FSIZE|OM_FZERO|OM_FSLOPPY|OM_FALIGN|_OM_FKEEP,OM_CTFL)
 
 #else
@@ -78 +68 @@
 #define omalloc(size)   _omalloc(size)
 #define omalloc0(size)  _omalloc0(size)
-#define omcalloc(n,size)_omalloc0(n*size)
 
 #endif
@@ -252 +241 @@
 #define omalloc(size)   _omalloc(size)
 #define omalloc0(size)  _omalloc0(size)
-#define omcalloc(n,size)_omalloc0(n*size)
 
 #define omreallocSize(addr,o_size,size) _omreallocSize(addr,o_size,size)