numpy
diff --git a/‎numpy/_core/meson.build
+1-1 b/‎numpy/_core/meson.build
+1-1
diff --git a/‎numpy/_core/src/multiarray/common.h
+8-8 b/‎numpy/_core/src/multiarray/common.h
+8-8
@@ -885,7 +885,7 @@ foreach gen_mtargets : [
   ],
   [
     'loops_arithmetic.dispatch.h',
-    src_file.process('src/umath/loops_arithmetic.dispatch.c.src'),
+    'src/umath/loops_arithmetic.dispatch.cpp',
     [
       AVX512_SKX, AVX512F, AVX2, SSE41, SSE2,
       NEON,
 
@@ -111,13 +111,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 "
-                         "for axis %d with size %"NPY_INTP_FMT,
+                         "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;
     }
@@ -172,13 +172,13 @@ check_and_adjust_axis(int *axis, int ndim)
  */
 #if (!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) offsetof(struct {char c; type v;}, v)
+#define NPY_ALIGNOF(type) __alignof__(type)
 #else
-# define NPY_ALIGNOF(type) _Alignof(type)
+#define NPY_ALIGNOF(type) _Alignof(type)
 #endif
-#define  NPY_ALIGNOF_UINT(type) npy_uint_alignment(sizeof(type))
+#define NPY_ALIGNOF_UINT(type) NPY_ALIGNOF(type)
 /*
  * Disable harmless compiler warning "4116: unnamed type definition in
  * parentheses" which is caused by the _ALIGN macro.
Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ foreach gen_mtargets : [`
`885`	`885`	`],`
`886`	`886`	`[`
`887`	`887`	`'loops_arithmetic.dispatch.h',`
`888`		`- src_file.process('src/umath/loops_arithmetic.dispatch.c.src'),`
	`888`	`+ 'src/umath/loops_arithmetic.dispatch.cpp',`
`889`	`889`	`[`
`890`	`890`	`AVX512_SKX, AVX512F, AVX2, SSE41, SSE2,`
`891`	`891`	`NEON,`