[libdvdcss-devel] [PATCH] build: win32: Surround Windows-specific code by appropriate ifdef

[Alexander Strasser]

Hi!

Diego Biurrun wrote:
> Also move the direct.h #include into that block and drop the direct.h

  Where did you move it in the patch?

> configure.ac check. That header file is always available on Windows.

  I do not think I have nor need direct.h on Cygwin.

> Signed-off-by: Diego Biurrun <diego at biurrun.de>
> ---
> 
> Now w/o unnecessary direct.h #include.

  Or did you mean you removed direct.h include? If yes
then the commit message is confusing.

  Also I had the impression you submitted a patch for
MSVC earlier which would need direct.h to be included.


  Alexander

>  configure.ac    |    3 ---
>  src/libdvdcss.c |    6 +-----
>  2 files changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index ca2e708..326db26 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -57,9 +57,6 @@ CAN_BUILD_LIBDVDCSS=0
>  
>  dnl  for windoze
>  AC_CHECK_HEADERS(windows.h,[
> -  AC_CHECK_HEADERS(direct.h,,,[
> -  #include <windows.h>
> -  ])
>    AC_CHECK_HEADERS(winioctl.h,[
>      CAN_BUILD_LIBDVDCSS=1
>    ],,[
> diff --git a/src/libdvdcss.c b/src/libdvdcss.c
> index 4a09084..c4c6d77 100644
> --- a/src/libdvdcss.c
> +++ b/src/libdvdcss.c
> @@ -120,10 +120,6 @@
>  #   include <limits.h>
>  #endif
>  
> -#ifdef HAVE_DIRECT_H
> -#   include <direct.h>
> -#endif
> -
>  #include "dvdcss/dvdcss.h"
>  
>  #include "common.h"
> @@ -242,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)
>          typedef HRESULT( WINAPI *SHGETFOLDERPATH )
>                         ( HWND, int, HANDLE, DWORD, LPTSTR );
>  
> -- 
> 1.7.9.5