Added EOL, wrapped struct into preprocessor if/else

Author: oleksandr-pavlyk

mkl_random/src/numpy_multiiter_workaround.h

@@ -43,6 +43,9 @@
  * and `PyArray_MultiIter_DIMS`.
  */
 
+#define WORKAROUND_NEEDED (defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION))
+
+#if !WORKAROUND_NEEDED
 typedef struct {
     PyObject_HEAD
     int numiter;
@@ -52,27 +55,28 @@ typedef struct {
     npy_intp dimensions[32];
     void **iters;
 } multi_iter_proxy_st;
+#endif
 
 npy_intp workaround_PyArray_MultiIter_SIZE(PyArrayMultiIterObject *multi) {
-#if defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION)
+#if WORKAROUND_NEEDED
     return PyArray_MultiIter_SIZE(multi);
 #else
     return ((multi_iter_proxy_st *)(multi))->size;
 #endif
 }
 
 int workaround_PyArray_MultiIter_NDIM(PyArrayMultiIterObject *multi) {
-#if defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION)
+#if WORKAROUND_NEEDED
     return PyArray_MultiIter_NDIM(multi);
 #else
     return ((multi_iter_proxy_st *)(multi))->nd;
 #endif
 }
 
 npy_intp* workaround_PyArray_MultiIter_DIMS(PyArrayMultiIterObject *multi) {
-#if defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION)
+#if WORKAROUND_NEEDED
     return PyArray_MultiIter_DIMS(multi);
 #else
     return (((multi_iter_proxy_st *)(multi))->dimensions);
 #endif
-}
+}