[libdvdcss-devel] [PATCH] Make dependency on direct.h explicit

[Diego Biurrun]

On Tue, Jan 29, 2013 at 09:15:14PM +0100, Alexander Strasser wrote:
> 
>   I attached a patch to fix libdvdcss build on OS/2
> from inside MPlayer source directory.
> 
> --- src/libdvdcss.c
> +++ src/libdvdcss.c
> @@ -120,7 +120,7 @@
>  
> -#ifdef HAVE_DIRECT_H
> +#if defined(WIN32) && defined(HAVE_DIRECT_H) && HAVE_DIRECT_H
>  #   include <direct.h>
>  #endif
>  
> @@ -238,7 +238,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
>      if( psz_cache == NULL || psz_cache[0] == '\0' )
>      {
> -#ifdef HAVE_DIRECT_H
> +#if defined(WIN32) && defined(HAVE_DIRECT_H) && HAVE_DIRECT_H
>          typedef HRESULT( WINAPI *SHGETFOLDERPATH )
>                         ( HWND, int, HANDLE, DWORD, LPTSTR );

These are MPlayer-specific hacks that have no place in libdvdcss.

Diego