Commit 77f561a5 authored by Diego Biurrun's avatar Diego Biurrun Committed by Jean-Baptiste Kempf
Browse files

build: win32: Surround Windows-specific code by appropriate ifdef



Also drop the now unnecessary direct.h configure.ac check.
That header file is always available on Windows.
Signed-off-by: Diego Biurrun's avatarDiego Biurrun <diego@biurrun.de>
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 84b09924
......@@ -48,9 +48,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
],,[
......
......@@ -7,7 +7,6 @@
/* #undef DVD_STRUCT_IN_SYS_CDIO_H */
/* #undef DVD_STRUCT_IN_SYS_DVDIO_H */
/* #undef HAVE_BSD_DVD_STRUCT */
#define HAVE_DIRECT_H 1
#define HAVE_DLFCN_H 1
/* #undef HAVE_DVD_H */
/* #undef HAVE_INTTYPES_H */
......
......@@ -120,10 +120,6 @@
# include <limits.h>
#endif
#ifdef HAVE_DIRECT_H
# include <direct.h>
#endif
#include "dvdcss/dvdcss.h"
#include "common.h"
......@@ -132,7 +128,8 @@
#include "ioctl.h"
#include "device.h"
#if defined(WIN32)
#if defined(WIN32) && !defined(__CYGWIN__)
#include <direct.h>
#define mkdir(a, b) _mkdir(a)
#endif
......@@ -242,7 +239,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(__CYGWIN__)
typedef HRESULT( WINAPI *SHGETFOLDERPATH )
( HWND, int, HANDLE, DWORD, LPTSTR );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment