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

Skip to content

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

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 1 commit into from
Sep 26, 2023
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
BUG: Fix order of Windows OS detection macros. (#24762) 
* BUG: Fix order of Windows OS detection macros.

  - The order should be `__MINGW32__/__MINGW64__`, then `_WIN64`,
    and then `_WIN32`.

    64 bit MinGW compilers define `_MINGW32__`, `__MINGW64__`, `_WIN32`, and `_WIN64`.
    32 bit MinGW compilers define `__MINGW32__`, and `_WIN32`.
    64 bit MSVC compilation defines `_WIN32` and  `_WIN64`.
    32 bit MSVC compilation defines `_WIN32`.

  - Fixes #24761.

* Adjust the structure slightly and add comments.

  - This is better than just relying on the order of evaluation in the whole
    chain. Once Windows is detected (`_WIN32`), handle the possible known
    Windows environments separately.

* Remove check for non-standard macros.

  - `WIN32`, `__WIN32__`, `WIN64`, `__WIN64__` are not standard macros defined
    by Window compilers.

    It should be enough to check for `_WIN32` and `_WIN64` alone.
  • Loading branch information
@mahge @charris
mahge authored and charris committed Sep 26, 2023
commit 0a171690e3990792d99406fe3ce376417f5af0b8
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