Commit b30cd14b authored by James Almer's avatar James Almer

Merge commit 'bd9cd046'

* commit 'bd9cd046':
  w32pthreads: Fix function pointer casts
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 2c40adf2 bd9cd046
...@@ -399,18 +399,18 @@ static av_unused void w32thread_init(void) ...@@ -399,18 +399,18 @@ static av_unused void w32thread_init(void)
#if _WIN32_WINNT < 0x0600 #if _WIN32_WINNT < 0x0600
HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll")); HANDLE kernel_dll = GetModuleHandle(TEXT("kernel32.dll"));
/* if one is available, then they should all be available */ /* if one is available, then they should all be available */
cond_init = cond_init = (void (WINAPI*)(pthread_cond_t *))
(void*)GetProcAddress(kernel_dll, "InitializeConditionVariable"); GetProcAddress(kernel_dll, "InitializeConditionVariable");
cond_broadcast = cond_broadcast = (void (WINAPI*)(pthread_cond_t *))
(void*)GetProcAddress(kernel_dll, "WakeAllConditionVariable"); GetProcAddress(kernel_dll, "WakeAllConditionVariable");
cond_signal = cond_signal = (void (WINAPI*)(pthread_cond_t *))
(void*)GetProcAddress(kernel_dll, "WakeConditionVariable"); GetProcAddress(kernel_dll, "WakeConditionVariable");
cond_wait = cond_wait = (BOOL (WINAPI*)(pthread_cond_t *, pthread_mutex_t *, DWORD))
(void*)GetProcAddress(kernel_dll, "SleepConditionVariableCS"); GetProcAddress(kernel_dll, "SleepConditionVariableCS");
initonce_begin = initonce_begin = (BOOL (WINAPI*)(pthread_once_t *, DWORD, BOOL *, void **))
(void*)GetProcAddress(kernel_dll, "InitOnceBeginInitialize"); GetProcAddress(kernel_dll, "InitOnceBeginInitialize");
initonce_complete = initonce_complete = (BOOL (WINAPI*)(pthread_once_t *, DWORD, void *))
(void*)GetProcAddress(kernel_dll, "InitOnceComplete"); GetProcAddress(kernel_dll, "InitOnceComplete");
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment