Changeset 1cb3bb in git

Timestamp:

Feb 6, 2014, 8:03:37 PM (10 years ago)

Author:

Max Horn <max@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

e6f615c369efaa44a3f333f2edc7a9ffd41ec90f

Parents:

2b6e44080a10df42395250f99943f70d9a92c1d5

Message:

Invoke mmInit from Singular's main()

... and not from factory's initCanonicalForm()

Files:

• Singular/tesths.cc (modified) (1 diff)
• factory/canonicalform.cc (modified) (2 diffs)

Singular/tesths.cc

@@ -71 +71 @@
     char** argv)   /* parameter array */
 {
-  //mmInit();
+  mmInit();
   // Don't worry: ifdef OM_NDEBUG, then all these calls are undef'ed
   omInitRet_2_Info(argv[0]);

factory/canonicalform.cc

@@ -27 +27 @@
 int initializeCharacteristic();
 
-#ifdef SINGULAR
-extern int mmInit(void);
-#endif
-
 int
 initCanonicalForm( void )
@@ -36 +32 @@
     static bool initialized = false;
     if ( ! initialized ) {
-#if defined (SINGULAR)
-        (void)mmInit();
-#endif
-
         (void)initializeCharacteristic();
         initialized = true;