diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavutil/x86_cpu.h | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/x86_cpu.h')
| -rw-r--r-- | libavutil/x86_cpu.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h index 4b5f10527e..d29b7d8ad9 100644 --- a/libavutil/x86_cpu.h +++ b/libavutil/x86_cpu.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "config.h" -#ifdef ARCH_X86_64 +#if ARCH_X86_64 # define REG_a "rax" # define REG_b "rbx" # define REG_c "rcx" @@ -64,15 +64,10 @@ typedef int32_t x86_reg; # define REGSP esp #endif -#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && defined(HAVE_EBX_AVAILABLE) && defined(HAVE_EBP_AVAILABLE)) -# define HAVE_7REGS 1 -#endif - -#if defined(ARCH_X86_64) || (defined(ARCH_X86_32) && (defined(HAVE_EBX_AVAILABLE) || defined(HAVE_EBP_AVAILABLE))) -# define HAVE_6REGS 1 -#endif +#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) +#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) -#if defined(ARCH_X86_64) && defined(PIC) +#if ARCH_X86_64 && defined(PIC) # define BROKEN_RELOCATIONS 1 #endif |