mirror of https://github.com/freetype/freetype
* builds/windows/ftsystem.c: Use _WINRT_DLL to check for UWP.
Fixes compilation using Windows GDK, reported by Erin Melucci.
This commit is contained in:
parent
68399b4244
commit
cdd3572e52
|
@ -196,8 +196,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* non-desktop Universal Windows Platform */
|
/* support for Universal Windows Platform UWP, formerly WinRT */
|
||||||
#if defined( WINAPI_FAMILY ) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
|
#ifdef _WINRT_DLL
|
||||||
|
|
||||||
#define PACK_DWORD64( hi, lo ) ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
|
#define PACK_DWORD64( hi, lo ) ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
|
||||||
|
|
||||||
|
@ -248,10 +248,11 @@
|
||||||
dwCreationDisposition, &createExParams );
|
dwCreationDisposition, &createExParams );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif /* _WINRT_DLL */
|
||||||
|
|
||||||
|
|
||||||
#if defined( _WIN32_WCE )
|
/* support for Windows CE */
|
||||||
|
#ifdef _WIN32_WCE
|
||||||
|
|
||||||
/* malloc.h provides implementation of alloca()/_alloca() */
|
/* malloc.h provides implementation of alloca()/_alloca() */
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
@ -291,9 +292,9 @@
|
||||||
dwFlagsAndAttributes, hTemplateFile );
|
dwFlagsAndAttributes, hTemplateFile );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif /* _WIN32_WCE */
|
||||||
|
|
||||||
|
|
||||||
|
/* support for really old Windows */
|
||||||
#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
|
#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
|
||||||
!defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
|
!defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
|
||||||
|
|
||||||
|
@ -311,7 +312,7 @@
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif /* _WIN32_WCE || _WIN32_WINDOWS || _WIN32_WINNT <= 0x0400 */
|
||||||
|
|
||||||
|
|
||||||
/* documentation is in ftobjs.h */
|
/* documentation is in ftobjs.h */
|
||||||
|
|
Loading…
Reference in New Issue