[MPlayer-dev-eng] [PATCH] Fix libdvdcss on OS/2

[Erik Auerswald]

On Tue, Jan 22, 2013 at 11:14:54AM +0100, Diego Biurrun wrote:
> On Mon, Jan 21, 2013 at 11:47:56PM -0800, Dave Yeo wrote:
> > r35807 seems to have broke compilation on OS/2 due to OS/2 having
> > direct.h and it being unconditionally checked for.
> 
> How can a check break OS/2?  The issue must be somewhere else.

By activating a Windows-specific feature that was deactivated before...

> > --- libdvdcss.c (revision 35820)
> > +++ libdvdcss.c (working copy)
> > @@ -238,7 +238,7 @@
> >       */
> >      if( psz_cache == NULL || psz_cache[0] == '\0' )
> >      {
> > -#if HAVE_DIRECT_H
> > +#if defined (HAVE_DIRECT_H) && defined (HAVE_WIN_H)
> >          typedef HRESULT( WINAPI *SHGETFOLDERPATH )
> >                         ( HWND, int, HANDLE, DWORD, LPTSTR );
> 
> Umm, no, this is wrong, both are always defined.

Yes, the value of the define needs to be checked.

Erik
-- 
Use encryption performed on a remote server or with nonfree software is
best described as "clown storage".
                        -- Richard Stallman