[vlc-devel] [PATCH 20/22] mmdevice: fix the WINAPI callback type

Rémi Denis-Courmont remi at remlab.net
Fri Jul 31 17:05:18 CEST 2015


Le 2015-07-31 17:55, Steve Lhomme a écrit :
> ---
>  modules/audio_output/mmdevice.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/modules/audio_output/mmdevice.c
> b/modules/audio_output/mmdevice.c
> index d9d3573..ef9be5f 100644
> --- a/modules/audio_output/mmdevice.c
> +++ b/modules/audio_output/mmdevice.c
> @@ -44,10 +44,10 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName,
> 0xa45c254e, 0xdf1c, 0x4efd,
>  #include "audio_output/mmdevice.h"
>
>  #if (_WIN32_WINNT < 0x600)
> -static VOID WINAPI 
> (*InitializeConditionVariable)(PCONDITION_VARIABLE);
> -static BOOL WINAPI (*SleepConditionVariableCS)(PCONDITION_VARIABLE,
> +static VOID (WINAPI *InitializeConditionVariable) 
> (PCONDITION_VARIABLE);
> +static BOOL (WINAPI *SleepConditionVariableCS) (PCONDITION_VARIABLE,
>                                                 PCRITICAL_SECTION, 
> DWORD);
> -static VOID WINAPI (*WakeConditionVariable)(PCONDITION_VARIABLE);
> +static VOID (WINAPI *WakeConditionVariable)(PCONDITION_VARIABLE);
>  #define LOOKUP(s) \
>      if (((s) = (void *)GetProcAddress(h, #s)) == NULL) return FALSE

Just remove this hack. It is no longer necessary.

-- 
Rémi Denis-Courmont
http://www.remlab.net/



More information about the vlc-devel mailing list