numpy
diff --git a/‎numpy/_core/src/multiarray/common.h
Copy file name to clipboardExpand all lines: numpy/_core/src/multiarray/common.h
+5-7Lines changed: 5 additions & 7 deletions b/‎numpy/_core/src/multiarray/common.h
Copy file name to clipboardExpand all lines: numpy/_core/src/multiarray/common.h
+5-7Lines changed: 5 additions & 7 deletions
@@ -108,15 +108,13 @@ check_and_adjust_index(npy_intp *index, npy_intp max_item, int axis,
         /* Try to be as clear as possible about what went wrong. */
         if (axis >= 0) {
             PyErr_Format(PyExc_IndexError,
-                         "index %" NPY_INTP_FMT " is out of bounds "
+                         "index %" NPY_INTP_FMT" is out of bounds "
                          "for axis %d with size %" NPY_INTP_FMT,
                          *index, axis, max_item);
         } else {
             PyErr_Format(PyExc_IndexError,
                          "index %" NPY_INTP_FMT " is out of bounds "
                          "for size %" NPY_INTP_FMT, *index, max_item);
-                         "index %" NPY_INTP_FMT " is out of bounds "
-                         "for size %" NPY_INTP_FMT, *index, max_item);
         }
         return -1;
     }
@@ -173,13 +171,13 @@ check_and_adjust_axis(int *axis, int ndim)
 #define NPY_ALIGNOF(type) alignof(type)
 #elif (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
      || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-     && !defined __clang__) \
+  && !defined __clang__) \
      || (defined __clang__ && __clang_major__ < 8))
-#define NPY_ALIGNOF(type) __alignof__(type)
+# define NPY_ALIGNOF(type) offsetof(struct {char c; type v;}, v)
 #else
-#define NPY_ALIGNOF(type) _Alignof(type)
+# define NPY_ALIGNOF(type) _Alignof(type)
 #endif
-#define NPY_ALIGNOF_UINT(type) NPY_ALIGNOF(type)
+#define  NPY_ALIGNOF_UINT(type) npy_uint_alignment(sizeof(type))
 /*
  * Disable harmless compiler warning "4116: unnamed type definition in
  * parentheses" which is caused by the _ALIGN macro.