diff options
| author | Martin Storsjö <martin@martin.st> | 2023-08-02 00:48:50 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2023-08-04 21:51:20 +0300 |
| commit | 7aa9684db39a8ecf444b3af1c74c225757d8e49f (patch) | |
| tree | 1bf733734852baae9bbcbd480bd760bfbc3b1763 | |
| parent | 271c8229f8f53aa0683b4cf3eec1e4abcb4aba42 (diff) | |
| download | ffmpeg-7aa9684db39a8ecf444b3af1c74c225757d8e49f.tar.gz | |
w32pthreads: Fix function signature mismatches for CreateThread
In WinRT mode, we use CreateThread instead of _beginthreadex.
CreateThread takes a LPTHREAD_START_ROUTINE function pointer,
which has got the signature DWORD WINAPI ThreadProc(LPVOID).
_beginthreadex takes a function with the signature
unsigned __stdcall func(void *).
DWORD is defined as an unsigned long, which is different type
from unsigned int, even if they have the same size on Windows.
This fixes build failures with Clang 16 and newer, where function
pointer type mismatches are a fatal error by default.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | compat/w32pthreads.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 6405e72b64..dae8d9420d 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -66,7 +66,14 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define PTHREAD_CANCEL_ENABLE 1 #define PTHREAD_CANCEL_DISABLE 0 -static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) +#if HAVE_WINRT +#define THREADFUNC_RETTYPE DWORD +#else +#define THREADFUNC_RETTYPE unsigned +#endif + +static av_unused THREADFUNC_RETTYPE +__stdcall attribute_align_arg win32thread_worker(void *arg) { pthread_t *h = (pthread_t*)arg; h->ret = h->func(h->arg); |