diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-04 15:59:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-04 15:59:56 -0300 |
| commit | b30cd14b5732a668ca185f3e97dad73319893673 (patch) | |
| tree | 6d8fe1823229eafba27c7d0424720f20e1df7b6d | |
| parent | 2c40adf218c8991769fd6f55deffdea697361e3d (diff) | |
| parent | bd9cd04626a98a752c5771d057a6b86779359904 (diff) | |
| download | ffmpeg-b30cd14b5732a668ca185f3e97dad73319893673.tar.gz | |
Merge commit 'bd9cd04626a98a752c5771d057a6b86779359904'
* commit 'bd9cd04626a98a752c5771d057a6b86779359904':
w32pthreads: Fix function pointer casts
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | compat/w32pthreads.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 4ac2a995b8..0c9a7fa13b 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -399,18 +399,18 @@ static av_unused void w32thread_init(void) #if _WIN32_WINNT < 0x0600 HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll")); /* if one is available, then they should all be available */ - cond_init = - (void*)GetProcAddress(kernel_dll, "InitializeConditionVariable"); - cond_broadcast = - (void*)GetProcAddress(kernel_dll, "WakeAllConditionVariable"); - cond_signal = - (void*)GetProcAddress(kernel_dll, "WakeConditionVariable"); - cond_wait = - (void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS"); - initonce_begin = - (void*)GetProcAddress(kernel_dll, "InitOnceBeginInitialize"); - initonce_complete = - (void*)GetProcAddress(kernel_dll, "InitOnceComplete"); + cond_init = (void (WINAPI*)(pthread_cond_t *)) + GetProcAddress(kernel_dll, "InitializeConditionVariable"); + cond_broadcast = (void (WINAPI*)(pthread_cond_t *)) + GetProcAddress(kernel_dll, "WakeAllConditionVariable"); + cond_signal = (void (WINAPI*)(pthread_cond_t *)) + GetProcAddress(kernel_dll, "WakeConditionVariable"); + cond_wait = (BOOL (WINAPI*)(pthread_cond_t *, pthread_mutex_t *, DWORD)) + GetProcAddress(kernel_dll, "SleepConditionVariableCS"); + initonce_begin = (BOOL (WINAPI*)(pthread_once_t *, DWORD, BOOL *, void **)) + GetProcAddress(kernel_dll, "InitOnceBeginInitialize"); + initonce_complete = (BOOL (WINAPI*)(pthread_once_t *, DWORD, void *)) + GetProcAddress(kernel_dll, "InitOnceComplete"); #endif } |