Note return type of import_array as void *

This is a nasty macro that includes a return statement.
matthew-brett · Jun 20, 2024 · 66e5c52 · 66e5c52
1 parent a130d8f
commit 66e5c52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/lib/fff_python_wrapper/fffpy.c b/lib/fff_python_wrapper/fffpy.c
@@ -9,11 +9,7 @@
    because PyArray_API is defined static, in order not to share that symbol
    within the dso. (import_array() asks the pointer value to the python process)
 */
-/*
- * deal with differences in macro return result between Python 2 and 3
- * http://mail.scipy.org/pipermail/numpy-discussion/2010-December/054350.html
- */
-IMP_OUT fffpy_import_array(void) {
+void* fffpy_import_array(void) {
   import_array();
 }
 

diff --git a/lib/fff_python_wrapper/fffpy.h b/lib/fff_python_wrapper/fffpy.h
@@ -31,17 +31,8 @@
    static, in order not to share that symbol within the
    dso. (import_array() asks the pointer value to the python process)
 */
-/*
- * deal with differences in macro return result between Python 2 and 3
- * http://mail.scipy.org/pipermail/numpy-discussion/2010-December/054350.html
- */
-#if PY_MAJOR_VERSION >= 3
-typedef int IMP_OUT;
-#else
-typedef void IMP_OUT;
-#endif
 
-extern IMP_OUT fffpy_import_array(void);
+extern void* fffpy_import_array(void);
 
 /*!
   \brief Convert \c PyArrayObject to \c fff_vector