summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-06-04 17:56:28 -0600
committerCharles Harris <charlesr.harris@gmail.com>2015-06-04 18:00:50 -0600
commit8c18581110925ebe9e2b3530d4d5fc4afefbc8b0 (patch)
tree6d03f8f5090bfedb84ebc5e353c7925510ae2677
parentb1cfccd6d78be622ee85f658e8f9b4a2d5fc9ddb (diff)
downloadnumpy-8c18581110925ebe9e2b3530d4d5fc4afefbc8b0.tar.gz
BUG: Fix npy_cache_pyfunc to properly implement inline.
The function was not static, which led to multiple definition errors.
-rw-r--r--numpy/core/src/private/npy_import.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/core/src/private/npy_import.h b/numpy/core/src/private/npy_import.h
index e618e121e..a75c59884 100644
--- a/numpy/core/src/private/npy_import.h
+++ b/numpy/core/src/private/npy_import.h
@@ -2,7 +2,6 @@
#define NPY_IMPORT_H
#include <Python.h>
-#include <assert.h>
/*! \brief Fetch and cache Python function.
*
@@ -17,7 +16,7 @@
* @param function Function name.
* @param cache Storage location for imported function.
*/
-NPY_INLINE void
+NPY_INLINE static void
npy_cache_pyfunc(const char *module, const char *function, PyObject **cache)
{
if (*cache == NULL) {