Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'

[ffmpeg] / tests / checkasm / checkasm.c

diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 520397c856d0761b5959061f073079c27323285d..7ec8d67f4a41dfa6f53e4406e1943ed308e69da2 100644 (file)
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -33,10 +33,6 @@
 #include <io.h>
 #endif
 
-#if ARCH_X86
-#include "libavutil/x86/cpu.h"
-#endif
-
 #if HAVE_SETCONSOLETEXTATTRIBUTE
 #include <windows.h>
 #define COLOR_RED    FOREGROUND_RED
@@ -115,7 +111,7 @@ static const struct {
 
 typedef struct CheckasmFuncVersion {
     struct CheckasmFuncVersion *next;
-    intptr_t (*func)();
+    void *func;
     int ok;
     int cpu;
     int iterations;
@@ -391,10 +387,10 @@ int main(int argc, char *argv[])
 /* Decide whether or not the specified function needs to be tested and
  * allocate/initialize data structures if needed. Returns a pointer to a
  * reference function if the function should be tested, otherwise NULL */
-intptr_t (*checkasm_check_func(intptr_t (*func)(), const char *name, ...))()
+void *checkasm_check_func(void *func, const char *name, ...)
 {
     char name_buf[256];
-    intptr_t (*ref)() = func;
+    void *ref = func;
     CheckasmFuncVersion *v;
     int name_length;
     va_list arg;