[vlc-devel] [PATCH 10/41] Disable check_OS_capability() on OS/2

[Rémi Denis-Courmont]

On Mon, 10 Oct 2011 20:43:49 +0900, KO Myung-Hun <komh at chollian.net>
wrote:
> ---
>  src/misc/cpu.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/misc/cpu.c b/src/misc/cpu.c
> index 63a4bd2..22005c1 100644
> --- a/src/misc/cpu.c
> +++ b/src/misc/cpu.c
> @@ -53,7 +53,7 @@ static uint32_t cpu_flags;
>  
>  #if defined( __i386__ ) || defined( __x86_64__ ) || defined(
__powerpc__
>  ) \
>   || defined( __ppc__ ) || defined( __ppc64__ ) || defined(
__powerpc64__ )
> -# ifndef WIN32
> +# if !defined( WIN32 ) && !defined( __OS2__ )
>  static bool check_OS_capability( const char *psz_capability, pid_t pid
)
>  {
>      int status;
> @@ -86,7 +86,7 @@ static bool check_OS_capability( const char
> *psz_capability, pid_t pid )
>              i_capabilities |= (flag);                   \
>       } while(0)
>  
> -# else /* WIN32 */
> +# else /* WIN32 && __OS2__ */

Cosmetic, but it should read WIN32 || __OS2__.

>  #  define check_capability(name, flag, code, input)   \
>          i_capabilities |= (flag);
>  # endif

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