frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavutil / x86_cpu.h

diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index a60b0b56a80af08a82d47aaefdd81597f0217f7a..08d31461fb2c700ea63aa2af183876c43d87ce05 100644 (file)
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_X86CPU_H
-#define FFMPEG_X86CPU_H
+#ifndef AVUTIL_X86_CPU_H
+#define AVUTIL_X86_CPU_H
 
 #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"
@@ -43,7 +43,7 @@ typedef int64_t x86_reg;
 #    define REGd    rdx
 #    define REGSP   rsp
 
-#else
+#elif ARCH_X86_32
 
 #    define REG_a "eax"
 #    define REG_b "ebx"
@@ -62,18 +62,15 @@ typedef int32_t x86_reg;
 #    define REGc    ecx
 #    define REGd    edx
 #    define REGSP   esp
+#else
+typedef int x86_reg;
 #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
 
-#endif /* FFMPEG_X86CPU_H */
+#endif /* AVUTIL_X86_CPU_H */