Changeset bbeddf in git for dyn_modules/callgfanlib/gfanlib.cc

Timestamp:

Nov 15, 2013, 5:13:23 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

989d6be2dba06d1abec8f5c86bd77f2a001e1e4d

Parents:

1684c331ce908bffa043d3afe97c0a2c4b181d99

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:13:23+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:17:40+01:00

Message:

Fixed BS: gfanlib/cddlib checking/building/embedding

fix: cddlib configure checks
add: static building-in
fix: return code for _mod_init functions

File:

• dyn_modules/callgfanlib/gfanlib.cc (modified) (3 diffs)

dyn_modules/callgfanlib/gfanlib.cc

@@ -9 +9 @@
 #include <bbpolytope.h>
 #include <gitfan.h>
-#include "Singular/ipid.h"
+
+#include <Singular/ipid.h>
+#include <Singular/mod_lib.h>
 
 template class gfan::Vector<gfan::Integer>;
@@ -16 +18 @@
 template class gfan::Matrix<gfan::Rational>;
 
-extern "C" int mod_init(SModulFunctions* p)
+int SI_MOD_INIT(gfanlib)(SModulFunctions* p)
 {
   bbcone_setup(p);
@@ -22 +24 @@
   bbpolytope_setup(p);
   gitfan_setup(p);
+  return 0;
 }
+
+#ifndef EMBED_PYTHON
+extern "C"
+{ 
+int mod_init(SModulFunctions* psModulFunctions)
+{ 
+  return SI_MOD_INIT(gfanlib)(psModulFunctions); 
+}
+}
+#endif