Changeset 747dce in git for Singular/mmstd.c

Timestamp:

Feb 15, 2001, 1:58:17 PM (23 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

358fa445d664957214f7dfb5b5237c8d2b30b251

Parents:

7df57804d761a89bf836bda602393775154535cb

Message:

win adoption


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

File:

• Singular/mmstd.c (modified) (3 diffs)

Singular/mmstd.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmstd.c,v 1.3 2001-01-27 17:04:59 obachman Exp $ */
+/* $Id: mmstd.c,v 1.4 2001-02-15 12:58:17 levandov Exp $ */
 /*
 * ABSTRACT: standard version of C-memory management alloc func 
@@ -11 +11 @@
 
 #define OM_NO_MALLOC_MACROS
+#ifdef ix86_Win
+#define OMALLOC_USES_MALLOC
+#endif
 #include "omalloc.h"
 
@@ -22 +25 @@
 #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
+