summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-11-22 08:46:07 +0100
committerDiego Biurrun <diego@biurrun.de>2016-11-24 16:14:33 +0100
commitbd9cd04626a98a752c5771d057a6b86779359904 (patch)
treed46b932883f1b213f9f842778e3d80e968b52bd8
parent233d50b275dd7cf6cc0656851e670e1b2dfba56f (diff)
downloadffmpeg-streaming-bd9cd04626a98a752c5771d057a6b86779359904.zip
ffmpeg-streaming-bd9cd04626a98a752c5771d057a6b86779359904.tar.gz
w32pthreads: Fix function pointer casts
This eliminates a handful of warnings at every inclusion of the header.
-rw-r--r--compat/w32pthreads.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index 2fe2a5a..f38f767 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -382,18 +382,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
}
OpenPOWER on IntegriCloud