Changeset 672783 in git

Timestamp:

Jul 28, 2009, 4:59:52 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7b87efd89885ee6835475300c291481f6c035bb7

Parents:

a07e45cfc61927c5711cee673474fb891d4574ac

Message:

*hannes: restore old version


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

Files:

• Singular/tesths.cc (modified) (5 diffs)
• kernel/mminit.cc (modified) (2 diffs)

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.116 2009-07-28 14:19:05 Singular Exp $ */
+/* $Id: tesths.cc,v 1.117 2009-07-28 14:59:52 Singular Exp $ */
 
 /*
@@ -48 +48 @@
 #endif
 
-#if (! defined(LIBSINGULAR)) || defined(GENTABLE)
+#if ! defined(LIBSINGULAR)
 /*0 implementation*/
 int main(          /* main entry to Singular */
@@ -54 +54 @@
     char** argv)   /* parameter array */
 {
-// do not call mp_set_memory_functions in LIBSINGULAR:
-#if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
-    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
-    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
-    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
-    /* do not rely on the default in Singular as libsingular may be different */
-    mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
-#else
-    mp_set_memory_functions(malloc,reallocSize,freeSize);
-#endif
 #ifdef HAVE_FACTORY
   On(SW_USE_NTL);
@@ -143 +133 @@
   /* say hello */
   {
+#ifdef HAVE_NS
     basePack=(package)omAlloc0(sizeof(*basePack));
     currPack=basePack;
@@ -151 +142 @@
     currPackHdl=h;
     basePackHdl=h;
+#endif /* HAVE_NS */
   }
   if (BVERBOSE(0))

kernel/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.5 2009-07-28 14:15:05 Singular Exp $ */
+/* $Id: mminit.cc,v 1.6 2009-07-28 14:59:30 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -38 +38 @@
   if(mmIsInitialized==0)
   {
+#if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
+    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
+    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
+    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
+    /* do not rely on the default in Singular as libsingular may be different */
+    mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
+#else
+    mp_set_memory_functions(malloc,reallocSize,freeSize);
+#endif
     om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;
 #ifndef OM_NDEBUG