Merge pull request matplotlib#6189 from jenshnielsen/revertclangcleanup

Revert part of matplotlib#6052

Author: jenshnielsen

setupext.py

@@ -898,11 +898,6 @@ def add_flags(self, ext):
         ext.define_macros.append(('NPY_NO_DEPRECATED_API',
                                   'NPY_1_7_API_VERSION'))
 
-        # Allow the numpy NPY_INTP_FMT macro to be used in C++.
-        # On gcc this translates to PRIdPTR which needs
-        # __STDC_FORMAT_MACROS to be usable in c++
-        ext.define_macros.append(('__STDC_FORMAT_MACROS', 1))
-
     def get_setup_requires(self):
         return ['numpy>=1.6']
 

src/_backend_agg_wrapper.cpp

@@ -449,14 +449,14 @@ PyRendererAgg_draw_gouraud_triangle(PyRendererAgg *self, PyObject *args, PyObjec
 
     if (points.dim(0) != 3 || points.dim(1) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "points must be a 3x2 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "points must be a 3x2 array, got %dx%d",
                      points.dim(0), points.dim(1));
         return NULL;
     }
 
     if (colors.dim(0) != 3 || colors.dim(1) != 4) {
         PyErr_Format(PyExc_ValueError,
-                     "colors must be a 3x4 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "colors must be a 3x4 array, got %dx%d",
                      colors.dim(0), colors.dim(1));
         return NULL;
     }
@@ -490,21 +490,21 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args, PyObje
 
     if (points.size() != 0 && (points.dim(1) != 3 || points.dim(2) != 2)) {
         PyErr_Format(PyExc_ValueError,
-                     "points must be a Nx3x2 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "points must be a Nx3x2 array, got %dx%dx%d",
                      points.dim(0), points.dim(1), points.dim(2));
         return NULL;
     }
 
     if (colors.size() != 0 && (colors.dim(1) != 3 || colors.dim(2) != 4)) {
         PyErr_Format(PyExc_ValueError,
-                     "colors must be a Nx3x4 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "colors must be a Nx3x4 array, got %dx%dx%d",
                      colors.dim(0), colors.dim(1), colors.dim(2));
         return NULL;
     }
 
     if (points.size() != colors.size()) {
         PyErr_Format(PyExc_ValueError,
-                     "points and colors arrays must be the same length, got %"NPY_INTP_FMT" and %"NPY_INTP_FMT,
+                     "points and colors arrays must be the same length, got %d and %d",
                      points.dim(0), colors.dim(0));
         return NULL;
     }

src/_image_wrapper.cpp

@@ -273,7 +273,7 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
         } else {
             PyErr_Format(
                 PyExc_ValueError,
-                "If 3-dimensional, array must be RGBA.  Got %" NPY_INTP_FMT " planes.",
+                "If 3-dimensional, array must be RGBA.  Got %d planes.",
                 PyArray_DIM(input_array, 2));
             goto error;
         }

src/_path_wrapper.cpp

@@ -214,7 +214,7 @@ static PyObject *Py_update_path_extents(PyObject *self, PyObject *args, PyObject
 
     if (minpos.dim(0) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "minpos must be of length 2, got %"NPY_INTP_FMT,
+                     "minpos must be of length 2, got %d",
                      minpos.dim(0));
         return NULL;
     }

src/py_converters.cpp

@@ -535,7 +535,7 @@ int convert_points(PyObject *obj, void *pointsp)
 
     if (points->dim(1) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "Points must be Nx2 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "Points must be Nx2 array, got %dx%d",
                      points->dim(0), points->dim(1));
         return 0;
     }
@@ -559,7 +559,7 @@ int convert_transforms(PyObject *obj, void *transp)
 
     if (trans->dim(1) != 3 || trans->dim(2) != 3) {
         PyErr_Format(PyExc_ValueError,
-                     "Transforms must be Nx3x3 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "Transforms must be Nx3x3 array, got %dx%dx%d",
                      trans->dim(0), trans->dim(1), trans->dim(2));
         return 0;
     }
@@ -583,7 +583,7 @@ int convert_bboxes(PyObject *obj, void *bboxp)
 
     if (bbox->dim(1) != 2 || bbox->dim(2) != 2) {
         PyErr_Format(PyExc_ValueError,
-                     "Bbox array must be Nx2x2 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "Bbox array must be Nx2x2 array, got %dx%dx%d",
                      bbox->dim(0), bbox->dim(1), bbox->dim(2));
         return 0;
     }
@@ -607,7 +607,7 @@ int convert_colors(PyObject *obj, void *colorsp)
 
     if (colors->dim(1) != 4) {
         PyErr_Format(PyExc_ValueError,
-                     "Colors array must be Nx4 array, got %"NPY_INTP_FMT"x%"NPY_INTP_FMT,
+                     "Colors array must be Nx4 array, got %dx%d",
                      colors->dim(0), colors->dim(1));
         return 0;
     }