summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-06-02 17:08:38 -0500
committerMark Wiebe <mwiebe@enthought.com>2011-06-02 17:08:38 -0500
commit8f35cd72500420512915f75cbefe7dd9fc12a009 (patch)
treefdcd4eb7b6536bd328581dc3714cf962cfe4c64e
parent6c2c90c4a3bda6acb89e27d299d312f795e452bf (diff)
downloadnumpy-8f35cd72500420512915f75cbefe7dd9fc12a009.tar.gz
WRN: Eliminate a number of compiler warnings
-rw-r--r--numpy/core/include/numpy/npy_3kcompat.h4
-rw-r--r--numpy/core/src/multiarray/arraytypes.c.src1
-rw-r--r--numpy/core/src/multiarray/dtype_transfer.c1
-rw-r--r--numpy/core/src/multiarray/lowlevel_strided_loops.c.src1
4 files changed, 2 insertions, 5 deletions
diff --git a/numpy/core/include/numpy/npy_3kcompat.h b/numpy/core/include/numpy/npy_3kcompat.h
index 02355e852..7ff9c8f48 100644
--- a/numpy/core/include/numpy/npy_3kcompat.h
+++ b/numpy/core/include/numpy/npy_3kcompat.h
@@ -348,7 +348,7 @@ NpyCapsule_Check(PyObject *ptr)
return PyCapsule_CheckExact(ptr);
}
-static void
+static NPY_INLINE void
simple_capsule_dtor(PyObject *cap)
{
PyArray_free(PyCapsule_GetPointer(cap, NULL));
@@ -387,7 +387,7 @@ NpyCapsule_Check(PyObject *ptr)
return PyCObject_Check(ptr);
}
-static void
+static NPY_INLINE void
simple_capsule_dtor(void *ptr)
{
PyArray_free(ptr);
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 3059c4109..426a9be91 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -1,7 +1,6 @@
/* -*- c -*- */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "datetime.h"
#include "structmember.h"
#define _MULTIARRAYMODULE
diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c
index 73bb76ac1..c61bc1cce 100644
--- a/numpy/core/src/multiarray/dtype_transfer.c
+++ b/numpy/core/src/multiarray/dtype_transfer.c
@@ -16,7 +16,6 @@
#define _MULTIARRAYMODULE
#include <numpy/ndarrayobject.h>
-#include <numpy/ufuncobject.h>
#include <numpy/npy_cpu.h>
#include "numpy/npy_3kcompat.h"
diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
index fc8d71f46..0a1786bc4 100644
--- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
+++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
@@ -14,7 +14,6 @@
#define _MULTIARRAYMODULE
#include <numpy/ndarrayobject.h>
-#include <numpy/ufuncobject.h>
#include <numpy/npy_cpu.h>
#include <numpy/halffloat.h>