summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_bitmap.c2
-rw-r--r--libass/ass_render.c2
-rw-r--r--libass/ass_utils.c2
-rw-r--r--libass/ass_utils.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c
index 5e2ca77..b11fcfa 100644
--- a/libass/ass_bitmap.c
+++ b/libass/ass_bitmap.c
@@ -42,7 +42,7 @@
#undef ALIGN
#undef DECORATE
-#if (defined(__i386__) || defined(__x86_64__)) && CONFIG_ASM
+#if CONFIG_ASM && ARCH_X86
#define ALIGN 4
#define DECORATE(func) ass_##func##_sse2
diff --git a/libass/ass_render.c b/libass/ass_render.c
index d5c931a..5a73c35 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -74,7 +74,7 @@ ASS_Renderer *ass_renderer_init(ASS_Library *library)
priv->ftlibrary = ft;
// images_root and related stuff is zero-filled in calloc
-#if (defined(__i386__) || defined(__x86_64__)) && CONFIG_ASM
+#if CONFIG_ASM && ARCH_X86
if (has_avx2())
priv->engine = &ass_bitmap_engine_avx2;
else if (has_sse2())
diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index 57f6306..3248cf3 100644
--- a/libass/ass_utils.c
+++ b/libass/ass_utils.c
@@ -31,7 +31,7 @@
#include "ass_utils.h"
#include "ass_string.h"
-#if (defined(__i386__) || defined(__x86_64__)) && CONFIG_ASM
+#if CONFIG_ASM && ARCH_X86
#include "x86/cpuid.h"
diff --git a/libass/ass_utils.h b/libass/ass_utils.h
index baee383..9d6e166 100644
--- a/libass/ass_utils.h
+++ b/libass/ass_utils.h
@@ -50,7 +50,7 @@
#define FEATURE_MASK(feat) (((uint32_t) 1) << (feat))
-#if (defined(__i386__) || defined(__x86_64__)) && CONFIG_ASM
+#if CONFIG_ASM && ARCH_X86
int has_sse2(void);
int has_avx(void);
int has_avx2(void);