[j.5] Fix size detection of numeric types (backport from main, closed #951) ()

Merging branch 'j.5'  into 'r21'.

See merge request !2543

PyCore/Embed/PyInterpreter.cpp

@@ -379,12 +379,12 @@ std::vector<double> PyInterpreter::Numpy::createVectorFromArray2D(PyObject* pyob
 
 // prevent the error from Windows compiler MSVC 19:
 // `error C2196: case value 'NPY_LONG' already used`
-#ifndef _WIN32
+#if NPY_LONG != NPY_INT32
 
     case NPY_LONG:
         _realArray2DToDouble<npy_long>(npArray_ptr, rowIdxMax, colIdxMax, data);
         break;
-#endif // _WIN32
+#endif
 
     // unsigned int
     case NPY_UINT8:
@@ -399,11 +399,11 @@ std::vector<double> PyInterpreter::Numpy::createVectorFromArray2D(PyObject* pyob
 
 // prevent the error from Windows compiler MSVC 19:
 // `error C2196: case value 'NPY_ULONG' already used`
-#ifndef _WIN32
+#if NPY_ULONG != NPY_UINT32
     case NPY_ULONG:
         _realArray2DToDouble<npy_ulong>(npArray_ptr, rowIdxMax, colIdxMax, data);
         break;
-#endif // _WIN32
+#endif
 
     default:
         throw std::runtime_error(errorDescription("PyInterpreter::Numpy: "