Merge branch 'ufunc'

Conflicts:

	numpy/core/code_generators/genapi.py

3 files changed, 5 insertions, 5 deletions

diff --git a/numpy/core/src/math_c99.inc.src b/numpy/core/src/umath_funcs_c99.inc.src
index 828331875..828331875 100644
--- a/numpy/core/src/math_c99.inc.src
+++ b/numpy/core/src/umath_funcs_c99.inc.src
diff --git a/numpy/core/src/ufuncobject.c b/numpy/core/src/umath_ufunc_object.inc
index 6c704b6c6..6c704b6c6 100644
--- a/numpy/core/src/ufuncobject.c
+++ b/numpy/core/src/umath_ufunc_object.inc
diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src
index b9e8b56a7..d07bffa2a 100644
--- a/numpy/core/src/umathmodule.c.src
+++ b/numpy/core/src/umathmodule.c.src
@@ -21,7 +21,7 @@
 #define M_PI 3.14159265358979323846264338328
 #endif
 
-#include "math_c99.inc"
+#include "umath_funcs_c99.inc"
 
 /*
  *****************************************************************************
@@ -182,9 +182,9 @@ npy_Object@Kind@(PyObject *i1, PyObject *i2)
 
 /*
  * Don't pass structures between functions (only pointers) because how
- * structures are passed is compiler dependent and could cause
- * segfaults if ufuncobject.c is compiled with a different compiler
- * than an extension that makes use of the UFUNC API
+ * structures are passed is compiler dependent and could cause segfaults if
+ * umath_ufunc_object.inc is compiled with a different compiler than an
+ * extension that makes use of the UFUNC API
  */
 
 /**begin repeat
@@ -1939,7 +1939,7 @@ OBJECT_sign(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(func))
  */
 
 #include "__umath_generated.c"
-#include "ufuncobject.c"
+#include "umath_ufunc_object.inc"
 #include "__ufunc_api.c"
 
 static PyUFuncGenericFunction frexp_functions[] = {