diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-01 16:41:39 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-07 16:54:03 +0000 |
| commit | a7831d509f8db397f74895dca3dd3b4ac791ef03 (patch) | |
| tree | 22cac51b499ab8c14039ac79cc78b8b75c6089f3 /libavcodec/arm/mathops.h | |
| parent | 7f2b3dcabd108926bde819ad574017f4161d1546 (diff) | |
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
These macros reflect the actual capabilities required here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/arm/mathops.h')
| -rw-r--r-- | libavcodec/arm/mathops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/mathops.h b/libavcodec/arm/mathops.h index 17a687da6a..45ac67d436 100644 --- a/libavcodec/arm/mathops.h +++ b/libavcodec/arm/mathops.h @@ -28,7 +28,7 @@ #if HAVE_INLINE_ASM -#if HAVE_ARMV6 +#if HAVE_ARMV6_INLINE #define MULH MULH static inline av_const int MULH(int a, int b) { @@ -50,7 +50,7 @@ static av_always_inline av_const int FASTDIV(int a, int b) return r; } -#else /* HAVE_ARMV6 */ +#else /* HAVE_ARMV6_INLINE */ #define FASTDIV FASTDIV static av_always_inline av_const int FASTDIV(int a, int b) @@ -64,7 +64,7 @@ static av_always_inline av_const int FASTDIV(int a, int b) #define MLS64(d, a, b) MAC64(d, -(a), b) -#if HAVE_ARMV5TE +#if HAVE_ARMV5TE_INLINE /* signed 16x16 -> 32 multiply add accumulate */ # define MAC16(rt, ra, rb) \ |