Changeset f8dcbcb in git for Singular/mmstd.c

Timestamp:

Jan 27, 2001, 6:04:59 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

995ba8e72c52d5e7ce134eb888bb7682e01af581

Parents:

d83977461ed45e8d1baf489f2bd39e88bd603aa3

Message:

windows port


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

File:

• Singular/mmstd.c (modified) (1 diff)

Singular/mmstd.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmstd.c,v 1.2 2001-01-24 16:54:04 levandov Exp $ */
+/* $Id: mmstd.c,v 1.3 2001-01-27 17:04:59 obachman Exp $ */
 /*
-* ABSTRACT: standard version of C-memory management alloc func
+* ABSTRACT: standard version of C-memory management alloc func 
+* i.e. (malloc/realloc/free)
 */
 
 #include "mod2.h"
 
-/* We define those, so that our values of 
-   OM_TRACK and OM_CHECK are used  */
+#define OM_NO_MALLOC_MACROS
+#include "omalloc.h"
+
+// we provide these functions, so that the settings of OM_CHECK
+// and OM_TRACK are used, but only provide them if omalloc is not based
+// on them
+#ifndef OMALLOC_USES_MALLOC
 
 // define this so that all addr allocated there are marked 
 // as static, i.e. not metioned by omPrintUsedAddr
-#ifndef ix86_Win
 #define OM_MALLOC_MARK_AS_STATIC
 #include <omalloc.c>
-#else
-#include <stdlib.h>
-void freeSize(void* addr, size_t size)
-{
-  if (addr) free(addr);
-}
-
-void* reallocSize(void* old_addr, size_t old_size, size_t new_size)
-{
-  if (old_addr && new_size)
-  {
-   return realloc(old_addr, new_size);
-  }
-  else 
-  {
-    freeSize(old_addr, old_size);
-    return malloc(new_size);
-  }
-}
 #endif