Changeset 4cb8c8 in git

Timestamp:

Apr 1, 2020, 8:39:57 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aec21088ae2dbaf6005ab178b79f3970e39e7d29

Parents:

52558a6b3a0a415be47b13181276001350a30b8e

Message:

fix: mod_init if no HAVE_PYTHON

Location:

Singular/dyn_modules

Files:

• pyobject/pyobject.cc (modified) (3 diffs)
• python/python_module.cc (modified) (4 diffs)

Singular/dyn_modules/pyobject/pyobject.cc

@@ -14 +14 @@
 
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON
 
 #include "omalloc/omalloc.h"
@@ -30 +29 @@
 #include "Singular/mod_lib.h"
 
+#ifdef HAVE_PYTHON
 #include <Python.h>
 
@@ -741 +741 @@
 }
 #undef PYOBJECT_ADD_C_PROC
+#else
+extern "C" int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
+{
+  PrintS("no pyobject support\n");
+  return MAX_TOK;
+}
 
 #endif /* HAVE_PYTHON */

Singular/dyn_modules/python/python_module.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
-#ifdef HAVE_PYTHON_MOD
 #include <stdlib.h>
 #include <stdio.h>
@@ -8 +7 @@
 #include <unistd.h>
 #include <sys/stat.h>
-#include <boost/python.hpp>
-#include <Python.h>
 #include "Singular/tok.h"
 #include "kernel/structs.h"
@@ -19 +16 @@
 #include "omalloc/omalloc.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <time.h>
+#if defined(HAVE_PYTHON_MOD) && defined(HAVE_PYTHON)
+#include <boost/python.hpp>
+#include <Python.h>
 #include <Python.h>
 #include "wrapper.h"
@@ -82 +79 @@
   return MAX_TOK;
 }
+#else
+extern "C" int SI_MOD_INIT(python_module)(SModulFunctions* psModulFunctions)
+{
+  PrintS("no python_mod support\n");
+  return MAX_TOK;
+}
 #endif