freetype-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] * builds/windows/ftsystem.c: Use _WINRT

From: Alexei Podtelezhnikov (@apodtele)
Subject: [Git][freetype/freetype][master] * builds/windows/ftsystem.c: Use _WINRT_DLL to check for UWP.
Date: Sat, 18 May 2024 02:28:19 +0000

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

  • cdd3572e
    by Alexei Podtelezhnikov (Алексей Подтележников) at 2024-05-17T22:25:00-04:00 
    * builds/windows/ftsystem.c: Use _WINRT_DLL to check for UWP.

Fixes compilation using Windows GDK, reported by Erin Melucci.

1 changed file:

Changes:

  • builds/windows/ftsystem.c
    ... ... @@ -196,8 +196,8 @@
    196 196 
       }
    197 197
    198 198
    199 
    -  /* non-desktop Universal Windows Platform */
    200 
    -#if defined( WINAPI_FAMILY ) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP
    199 
    +  /* support for Universal Windows Platform UWP, formerly WinRT */
    200 
    +#ifdef _WINRT_DLL
    201 201
    202 202 
     #define PACK_DWORD64( hi, lo )  ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )
    203 203
    ... ... @@ -248,10 +248,11 @@
    248 248 
                             dwCreationDisposition, &createExParams );
    249 249 
       }
    250 250
    251 
    -#endif
    251 
    +#endif  /* _WINRT_DLL */
    252 252
    253 253
    254 
    -#if defined( _WIN32_WCE )
    254 
    +  /* support for Windows CE */
    255 
    +#ifdef _WIN32_WCE
    255 256
    256 257 
       /* malloc.h provides implementation of alloca()/_alloca() */
    257 258 
       #include <malloc.h>
    ... ... @@ -291,9 +292,9 @@
    291 292 
                             dwFlagsAndAttributes, hTemplateFile );
    292 293 
       }
    293 294
    294 
    -#endif
    295 
    -
    295 
    +#endif  /* _WIN32_WCE */
    296 296
    297 
    +  /* support for really old Windows */
    297 298 
     #if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
    298 299 
         !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
    299 300
    ... ... @@ -311,7 +312,7 @@
    311 312 
           return TRUE;
    312 313 
       }
    313 314
    314 
    -#endif
    315 
    +#endif  /* _WIN32_WCE || _WIN32_WINDOWS || _WIN32_WINNT <= 0x0400 */
    315 316
    316 317
    317 318 
       /* documentation is in ftobjs.h */

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help

    reply via email to
    [Prev in Thread] Current Thread [Next in Thread]