Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BUG: Fix order of Windows OS detection macros. #24762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2023
Merged

BUG: Fix order of Windows OS detection macros. #24762

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db9777e
BUG: Fix order of Windows OS detection macros.
mahge Sep 20, 2023
dac960a
Adjust the structure slightly and add comments.
mahge Sep 21, 2023
356325c
Remove check for non-standard macros.
mahge Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions numpy/core/include/numpy/npy_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@
#define NPY_OS_SOLARIS
#elif defined(__CYGWIN__)
#define NPY_OS_CYGWIN
#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
#define NPY_OS_WIN32
#elif defined(_WIN64) || defined(__WIN64__) || defined(WIN64)
#define NPY_OS_WIN64
#elif defined(__MINGW32__) || defined(__MINGW64__)
/* We are on Windows.*/
#elif defined(_WIN32)
/* We are using MinGW (64-bit or 32-bit)*/
#if defined(__MINGW32__) || defined(__MINGW64__)
#define NPY_OS_MINGW
/* Otherwise, if _WIN64 is defined, we are targeting 64-bit Windows*/
#elif defined(_WIN64)
#define NPY_OS_WIN64
/* Otherwise assume we are targeting 32-bit Windows*/
#else
#define NPY_OS_WIN32
#endif
#elif defined(__APPLE__)
#define NPY_OS_DARWIN
#elif defined(__HAIKU__)
Expand Down