From 661c4a5fb51e7232bab879da54378d9cccdebe52 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sun, 17 Aug 2014 11:14:30 -0600 Subject: [PATCH] MAINT: Get rid of some harmless gcc warnings about macro redefines. The Python.h header likes to be included first, otherwise warnings about redefining "_POSIX_C_SOURCE" and "_XOPEN_SOURCE" are generated. This is really a problem with the Python.h header, but can be worked around by changing the order of inclusion. --- numpy/core/src/npysort/heapsort.c.src | 2 +- numpy/core/src/npysort/mergesort.c.src | 2 +- numpy/core/src/npysort/quicksort.c.src | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/numpy/core/src/npysort/heapsort.c.src b/numpy/core/src/npysort/heapsort.c.src index 84c9d7bd4a44..ba6c27f48e42 100644 --- a/numpy/core/src/npysort/heapsort.c.src +++ b/numpy/core/src/npysort/heapsort.c.src @@ -28,9 +28,9 @@ #define NPY_NO_DEPRECATED_API NPY_API_VERSION -#include #include "npy_sort.h" #include "npysort_common.h" +#include #define NOT_USED NPY_UNUSED(unused) #define PYA_QS_STACK 100 diff --git a/numpy/core/src/npysort/mergesort.c.src b/numpy/core/src/npysort/mergesort.c.src index 7f98c4016189..c99c0e614ace 100644 --- a/numpy/core/src/npysort/mergesort.c.src +++ b/numpy/core/src/npysort/mergesort.c.src @@ -28,9 +28,9 @@ #define NPY_NO_DEPRECATED_API NPY_API_VERSION -#include #include "npy_sort.h" #include "npysort_common.h" +#include #define NOT_USED NPY_UNUSED(unused) #define PYA_QS_STACK 100 diff --git a/numpy/core/src/npysort/quicksort.c.src b/numpy/core/src/npysort/quicksort.c.src index 272615ab328a..a27530eb4f5d 100644 --- a/numpy/core/src/npysort/quicksort.c.src +++ b/numpy/core/src/npysort/quicksort.c.src @@ -28,9 +28,9 @@ #define NPY_NO_DEPRECATED_API NPY_API_VERSION -#include #include "npy_sort.h" #include "npysort_common.h" +#include #define NOT_USED NPY_UNUSED(unused) #define PYA_QS_STACK 100