diff options
| author | rcombs <rcombs@rcombs.me> | 2022-11-11 18:37:55 -0600 |
|---|---|---|
| committer | rcombs <rcombs@rcombs.me> | 2024-04-25 00:51:07 -0700 |
| commit | 6f95d06dbf48048c36dcebf9ea6f3c685a8be499 (patch) | |
| tree | 34d10ae1c5ca328383c8cd68c4a2945fabe5f8f0 | |
| parent | e420bf642c25f1ba2effa586f491ad37a706e040 (diff) | |
| download | libass-6f95d06dbf48048c36dcebf9ea6f3c685a8be499.tar.bz2 libass-6f95d06dbf48048c36dcebf9ea6f3c685a8be499.tar.xz | |
ass_compat: centralize ASS_WINAPI_DESKTOP
| -rw-r--r-- | libass/ass_compat.h | 11 | ||||
| -rw-r--r-- | libass/ass_directwrite.h | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/libass/ass_compat.h b/libass/ass_compat.h index 38df913..52ac282 100644 --- a/libass/ass_compat.h +++ b/libass/ass_compat.h @@ -43,4 +43,15 @@ char *ass_strndup_fallback(const char *s, size_t n); // definition in ass_utils. #define strndup ass_strndup_fallback #endif +#ifdef _WIN32 + +#ifdef WINAPI_FAMILY +#include <winapifamily.h> +#define ASS_WINAPI_DESKTOP WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#else +#define ASS_WINAPI_DESKTOP 1 +#endif + +#endif // _WIN32 + #endif /* LIBASS_COMPAT_H */ diff --git a/libass/ass_directwrite.h b/libass/ass_directwrite.h index a14b951..bb1159c 100644 --- a/libass/ass_directwrite.h +++ b/libass/ass_directwrite.h @@ -22,13 +22,6 @@ #ifndef ASS_DIRECTWRITE_H #define ASS_DIRECTWRITE_H -#ifdef WINAPI_FAMILY -#include <winapifamily.h> -#define ASS_WINAPI_DESKTOP WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#else -#define ASS_WINAPI_DESKTOP 1 -#endif - ASS_FontProvider * ass_directwrite_add_provider(ASS_Library *lib, ASS_FontSelector *selector, const char *config, FT_Library ftlib); |