Skip to content

Commit 4dc1958

Browse files
committed
Fix WinRT detection.
1 parent 836caf1 commit 4dc1958

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

asio/include/asio/detail/config.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,12 @@
456456

457457
// WinRT target.
458458
#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)
461462
# 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)
464465
#endif // !defined(ASIO_WINDOWS_RUNTIME)
465466

466467
// Windows target. Excludes WinRT.
@@ -871,12 +872,12 @@
871872
# endif // ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)
872873
# endif // defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
873874
# endif // defined(__linux__)
874-
# if defined(ASIO_MSVC) && defined(WINAPI_FAMILY)
875+
# if defined(ASIO_MSVC) && defined(ASIO_WINDOWS_RUNTIME)
875876
# if (_MSC_VER >= 1700)
876877
# define ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
877878
# define ASIO_THREAD_KEYWORD __declspec(thread)
878879
# endif // (_MSC_VER >= 1700)
879-
# endif // defined(ASIO_MSVC) && defined(WINAPI_FAMILY)
880+
# endif // defined(ASIO_MSVC) && defined(ASIO_WINDOWS_RUNTIME)
880881
#endif // !defined(ASIO_DISABLE_THREAD_KEYWORD_EXTENSION)
881882
#if !defined(ASIO_THREAD_KEYWORD)
882883
# define ASIO_THREAD_KEYWORD __thread

0 commit comments

Comments
 (0)