Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:31:29 +0000 (12:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 10:31:29 +0000 (12:31 +0200)
* commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc':
  w32pthreads: Mark functions in compatibility wrapper as av_unused

Conflicts:
compat/w32pthreads.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
compat/w32pthreads.h

@@@ -39,7 -39,7 +39,8 @@@
  #include <windows.h>
  #include <process.h>
  
+ #include "libavutil/attributes.h"
 +#include "libavutil/common.h"
  #include "libavutil/internal.h"
  #include "libavutil/mem.h"
  
@@@ -146,7 -146,7 +147,7 @@@ typedef struct  win32_cond_t 
      volatile int is_broadcast;
  } win32_cond_t;
  
- static int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
 -static av_unused void pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
++static av_unused int pthread_cond_init(pthread_cond_t *cond, const void *unused_attr)
  {
      win32_cond_t *win32_cond = NULL;
      if (cond_init) {
  
      pthread_mutex_init(&win32_cond->mtx_waiter_count, NULL);
      pthread_mutex_init(&win32_cond->mtx_broadcast, NULL);
 +    return 0;
  }
  
- static void pthread_cond_destroy(pthread_cond_t *cond)
+ static av_unused void pthread_cond_destroy(pthread_cond_t *cond)
  {
      win32_cond_t *win32_cond = cond->ptr;
      /* native condition variables do not destroy */