|
456 | 456 |
|
457 | 457 | // WinRT target.
|
458 | 458 | #if !defined(ASIO_WINDOWS_RUNTIME)
|
459 |
| -# if defined(WINAPI_FAMILY) |
460 |
| -# if ((WINAPI_FAMILY & WINAPI_PARTITION_APP) != 0) |
| 459 | +# if defined(__cplusplus_winrt) |
| 460 | +# include <winapifamily.h> |
| 461 | +# if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) |
461 | 462 | # define ASIO_WINDOWS_RUNTIME 1
|
462 |
| -# endif // ((WINAPI_FAMILY & WINAPI_PARTITION_APP) != 0) |
463 |
| -# endif // defined(WINAPI_FAMILY) |
| 463 | +# endif // WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) |
| 464 | +# endif // defined(__cplusplus_winrt) |
464 | 465 | #endif // !defined(ASIO_WINDOWS_RUNTIME)
|
465 | 466 |
|
466 | 467 | // Windows target. Excludes WinRT.
|
|
871 | 872 | # endif // ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)
|
872 | 873 | # endif // defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
|
873 | 874 | # endif // defined(__linux__)
|
874 |
| -# if defined(ASIO_MSVC) && defined(WINAPI_FAMILY) |
| 875 | +# if defined(ASIO_MSVC) && defined(ASIO_WINDOWS_RUNTIME) |
875 | 876 | # if (_MSC_VER >= 1700)
|
876 | 877 | # define ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
|
877 | 878 | # define ASIO_THREAD_KEYWORD __declspec(thread)
|
878 | 879 | # endif // (_MSC_VER >= 1700)
|
879 |
| -# endif // defined(ASIO_MSVC) && defined(WINAPI_FAMILY) |
| 880 | +# endif // defined(ASIO_MSVC) && defined(ASIO_WINDOWS_RUNTIME) |
880 | 881 | #endif // !defined(ASIO_DISABLE_THREAD_KEYWORD_EXTENSION)
|
881 | 882 | #if !defined(ASIO_THREAD_KEYWORD)
|
882 | 883 | # define ASIO_THREAD_KEYWORD __thread
|
|
0 commit comments