merge 0.22.x branch into master

CHANGES.rst

@@ -40,6 +40,9 @@ Bugs fixed
 * Failure to find any files for the path pattern(s) passed into ``cythonize()``
   is now an error to more easily detect accidental typos.
 
+* The ``logaddexp`` family of functions in ``numpy.math`` now has correct
+  declarations.
+
 Other changes
 -------------
 
@@ -47,7 +50,11 @@ Other changes
   To try parsing your files against this grammar, use the --formal_grammar directive.
   Experimental.
 
-* ``_`` is no longer considered a cacheable builtin as it could interfere with gettext.
+* ``_`` is no longer considered a cacheable builtin as it could interfere with
+  gettext.
+
+* The ``PyTypeObject`` declaration in ``cpython.object`` was extended to include
+  the CPython type flags.
 
 
 0.21.2 (2014-12-27)

Cython/Includes/numpy/math.pxd

@@ -119,15 +119,15 @@ cdef extern from "numpy/npy_math.h" nogil:
     # NumPy extensions
     float deg2radf "npy_deg2radf"(float x)
     float rad2degf "npy_rad2degf"(float x)
-    float logaddexpf "npy_logaddexpf"(float x)
-    float logaddexp2f "npy_logaddexp2f"(float x)
+    float logaddexpf "npy_logaddexpf"(float x, float y)
+    float logaddexp2f "npy_logaddexp2f"(float x, float y)
 
     double deg2rad "npy_deg2rad"(double x)
     double rad2deg "npy_rad2deg"(double x)
-    double logaddexp "npy_logaddexp"(double x)
-    double logaddexp2 "npy_logaddexp2"(double x)
+    double logaddexp "npy_logaddexp"(double x, double y)
+    double logaddexp2 "npy_logaddexp2"(double x, double y)
 
     long double deg2radl "npy_deg2radl"(long double x)
     long double rad2degl "npy_rad2degl"(long double x)
-    long double logaddexpl "npy_logaddexpl"(long double x)
-    long double logaddexp2l "npy_logaddexp2l"(long double x)
+    long double logaddexpl "npy_logaddexpl"(long double x, long double y)
+    long double logaddexp2l "npy_logaddexp2l"(long double x, long double y)