[FFmpeg-cvslog] w32pthreads: Fix function pointer casts
Diego Biurrun
git at videolan.org
Tue Apr 4 22:00:24 EEST 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Nov 22 08:46:07 2016 +0100| [bd9cd04626a98a752c5771d057a6b86779359904] | committer: Diego Biurrun
w32pthreads: Fix function pointer casts
This eliminates a handful of warnings at every inclusion of the header.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd9cd04626a98a752c5771d057a6b86779359904
---
compat/w32pthreads.h | 24 ++++++++++++------------
1 file 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
}
More information about the ffmpeg-cvslog
mailing list