Skip to content

Commit 82ee92b

Browse files
committed
Fix warnings from WORKAROUND_NEEDED macro
1 parent 9e3ca5a commit 82ee92b

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

mkl_random/src/numpy_multiiter_workaround.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@
4343
* and `PyArray_MultiIter_DIMS`.
4444
*/
4545

46-
#define WORKAROUND_NEEDED (defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION))
46+
#if (defined(NPY_2_0_API_VERSION) && (NPY_API_VERSION >= NPY_2_0_API_VERSION))
47+
#define WORKAROUND_NEEDED
48+
#endif
4749

48-
#if !WORKAROUND_NEEDED
50+
#if !defined(WORKAROUND_NEEDED)
4951
typedef struct {
5052
PyObject_HEAD
5153
int numiter;
@@ -58,23 +60,23 @@ typedef struct {
5860
#endif
5961

6062
npy_intp workaround_PyArray_MultiIter_SIZE(PyArrayMultiIterObject *multi) {
61-
#if WORKAROUND_NEEDED
63+
#if defined(WORKAROUND_NEEDED)
6264
return PyArray_MultiIter_SIZE(multi);
6365
#else
6466
return ((multi_iter_proxy_st *)(multi))->size;
6567
#endif
6668
}
6769

6870
int workaround_PyArray_MultiIter_NDIM(PyArrayMultiIterObject *multi) {
69-
#if WORKAROUND_NEEDED
71+
#if defined(WORKAROUND_NEEDED)
7072
return PyArray_MultiIter_NDIM(multi);
7173
#else
7274
return ((multi_iter_proxy_st *)(multi))->nd;
7375
#endif
7476
}
7577

7678
npy_intp* workaround_PyArray_MultiIter_DIMS(PyArrayMultiIterObject *multi) {
77-
#if WORKAROUND_NEEDED
79+
#if defined(WORKAROUND_NEEDED)
7880
return PyArray_MultiIter_DIMS(multi);
7981
#else
8082
return (((multi_iter_proxy_st *)(multi))->dimensions);

0 commit comments

Comments
 (0)