* not mutexes */
typedef CRITICAL_SECTION pthread_mutex_t;
-/* This is the CONDITIONAL_VARIABLE typedef for using Window's native
- * conditional variables on kernels 6.0+.
- * MinGW does not currently have this typedef. */
+/* This is the CONDITION_VARIABLE typedef for using Windows' native
+ * conditional variables on kernels 6.0+. */
+#if HAVE_CONDITION_VARIABLE_PTR
+typedef CONDITION_VARIABLE pthread_cond_t;
+#else
typedef struct pthread_cond_t {
- void *ptr;
+ void *Ptr;
} pthread_cond_t;
+#endif
/* function pointers to conditional variable API on windows 6.0+ kernels */
#if _WIN32_WINNT < 0x0600
win32_cond = av_mallocz(sizeof(win32_cond_t));
if (!win32_cond)
return;
- cond->ptr = win32_cond;
+ cond->Ptr = win32_cond;
win32_cond->semaphore = CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
if (!win32_cond->semaphore)
return;
static av_unused void pthread_cond_destroy(pthread_cond_t *cond)
{
- win32_cond_t *win32_cond = cond->ptr;
+ win32_cond_t *win32_cond = cond->Ptr;
/* native condition variables do not destroy */
if (cond_init)
return;
pthread_mutex_destroy(&win32_cond->mtx_waiter_count);
pthread_mutex_destroy(&win32_cond->mtx_broadcast);
av_freep(&win32_cond);
- cond->ptr = NULL;
+ cond->Ptr = NULL;
}
static av_unused void pthread_cond_broadcast(pthread_cond_t *cond)
{
- win32_cond_t *win32_cond = cond->ptr;
+ win32_cond_t *win32_cond = cond->Ptr;
int have_waiter;
if (cond_broadcast) {
static av_unused int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
{
- win32_cond_t *win32_cond = cond->ptr;
+ win32_cond_t *win32_cond = cond->Ptr;
int last_waiter;
if (cond_wait) {
cond_wait(cond, mutex, INFINITE);
static av_unused void pthread_cond_signal(pthread_cond_t *cond)
{
- win32_cond_t *win32_cond = cond->ptr;
+ win32_cond_t *win32_cond = cond->Ptr;
int have_waiter;
if (cond_signal) {
cond_signal(cond);