Changeset 4c9123 in git for Singular/dyn_modules

Timestamp:

Mar 26, 2020, 4:32:21 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

02a9dadc7f5964618d61b0c761adf0753d321a13

Parents:

ebe5f25ffed4d8ab6b82e565b71a7bc3db6b79a0

Message:

Revert "config: test for Python.h" and mod. ax_python_devel

This reverts commit 9bed75c35c6440a1b1e59d373fffe21b31bff389.

Location:

Singular/dyn_modules

Files:

• machinelearning/machinelearning.cc (modified) (2 diffs)
• machinelearning/mlpredict.c (modified) (1 diff)
• machinelearning/mlpredict.h (modified) (1 diff)
• pyobject/pyobject.cc (modified) (2 diffs)
• python/python_module.cc (modified) (2 diffs)

Singular/dyn_modules/machinelearning/machinelearning.cc

@@ -8 +8 @@
 
 #ifdef HAVE_PYTHON
-#ifdef HAVE_PYTHON_H
 
 #include "mlpredict.h"
@@ -82 +81 @@
 #endif
 #endif
-#endif

Singular/dyn_modules/machinelearning/mlpredict.c

@@ -12 +12 @@
 #include "kernel/mod2.h"
 #if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
-#if defined(HAVE_PYTHON) && defined(HAVE_PYTHON_H)
+#ifdef HAVE_PYTHON
 
 #include <Python.h>

Singular/dyn_modules/machinelearning/mlpredict.h

@@ -10 +10 @@
 
 #if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
-#if defined(HAVE_PYTHON) && defined(HAVE_PYTHON_H)
+#ifdef HAVE_PYTHON
 #ifdef __cplusplus
 extern "C" {

Singular/dyn_modules/pyobject/pyobject.cc

@@ -15 +15 @@
 #include "kernel/mod2.h"
 #ifdef HAVE_PYTHON
-#ifdef HAVE_PYTHON_H
 
 #include "omalloc/omalloc.h"
@@ -743 +742 @@
 #undef PYOBJECT_ADD_C_PROC
 
-#endif /* HAVE_PYTHON_H */
 #endif /* HAVE_PYTHON */

Singular/dyn_modules/python/python_module.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
 #ifdef HAVE_PYTHON_MOD
-#ifdef HAVE_PYTHON_H
 #include <stdlib.h>
 #include <stdio.h>
@@ -84 +83 @@
 }
 #endif
-#endif