|
@@ -116,7 +116,8 @@
|
|
|
|
|
|
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
|
|
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
|
|
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
|
/* Try to find out if we're compiling for WinRT or non-WinRT */
|
|
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700)) /* _MSC_VER==1700 for MSVC 2012 */
|
|
|
|
|
|
+/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */
|
|
|
|
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_) /* _MSC_VER==1700 for MSVC 2012 */
|
|
#include <winapifamily.h>
|
|
#include <winapifamily.h>
|
|
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
|
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
|
#undef __WINDOWS__
|
|
#undef __WINDOWS__
|