diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-11-01 18:34:40 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-11-01 18:34:40 +0000 |
| commit | 3cd52279c98910972371723c0654facfe3a1b2d1 (patch) | |
| tree | c1610e5942ad850464d7faee1136252aa47f49e8 /libavutil | |
| parent | a63e5f1cced5c5fe65845c89bbd5ff798b7b9542 (diff) | |
Use common define for x86_32 and x86_64.
Originally committed as revision 6859 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/bswap.h | 4 | ||||
| -rw-r--r-- | libavutil/common.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 46538f4ada..4614c90458 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -36,7 +36,7 @@ # define LEGACY_REGS "=q" #endif -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) static always_inline uint16_t bswap_16(uint16_t x) { __asm("rorw $8, %0" : @@ -149,7 +149,7 @@ static inline uint64_t bswap_64(uint64_t x) return r.ll; #endif } -#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */ +#endif /* defined(ARCH_X86) */ #endif /* !HAVE_BYTESWAP_H */ diff --git a/libavutil/common.h b/libavutil/common.h index bb049e9628..583273aed1 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -334,7 +334,7 @@ static inline int ff_get_fourcc(const char *s){ }\ } -#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC) +#if defined(ARCH_X86) || defined(ARCH_POWERPC) #if defined(ARCH_X86_64) static inline uint64_t read_time(void) { diff --git a/libavutil/internal.h b/libavutil/internal.h index 4f7e525cfd..1ed6d94b84 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -105,7 +105,7 @@ extern const uint32_t inverse[256]; -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) # define FASTDIV(a,b) \ ({\ int ret,dmy;\ @@ -154,7 +154,7 @@ static inline int ff_sqrt(int a) return ret; } -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) #define MASK_ABS(mask, level)\ asm volatile(\ "cdq \n\t"\ |