Changeset 1dbfb4 in git

Timestamp:

Aug 20, 2013, 11:38:21 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

f30df9db738239b192f944fedcdb9cc8322795e1

Parents:

3a40eba540d797f4185ee817d0902bd9a563af17

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-20 23:38:21+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-21 00:31:43+02:00

Message:

Adaptation of singmathic to SW

File:

• Singular/singmathic.cc (modified) (3 diffs)

Singular/singmathic.cc

@@ -1 @@
-#include "Singular/mod2.h"
-#include "kernel/ring.h"
-#include "kernel/febase.h"
-#include "kernel/ideals.h"
-#include "kernel/polys.h"
-#include "kernel/numbers.h"
-#include "kernel/options.h"
-#include "Singular/ipid.h"
+// include header files
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include <misc/auxiliary.h>
+#include <kernel/mod2.h>
+
+#include <misc/options.h>
+
+#include <kernel/febase.h>
+#include <kernel/ideals.h>
+#include <kernel/polys.h>
+
+#include <Singular/ipid.h>
+#include <Singular/mod_lib.h>
 
 #ifdef HAVE_MATHICGB
@@ -521 +529 @@
   (mgb::GroebnerInputIdealStream&, MathicToSingStream&);
 
-int singmathic_mod_init(SModulFunctions* psModulFunctions)
+int SI_MOD_INIT(singmathic)(SModulFunctions* psModulFunctions)
 {
   PrintS("Initializing Singular-Mathic interface Singmathic.\n");
@@ -545 +553 @@
 }
 
-#else
-
-int singmathic_mod_init(SModulFunctions* psModulFunctions)
+#else /* HAVE_MATHICGB */
+
+int SI_MOD_INIT(singmathic)(SModulFunctions* psModulFunctions)
 {
-  PrintS(
+  WerrorS(
     "Cannot initialize the Singular interface to MathicGB "
     "as this Singular executable was built without support "
     "for MathicGB."
   );
-}
-
-#endif
+  return 0;
+}
+
+#endif /* HAVE_MATHICGB */