[MPlayer-dev-eng] Re: [PATCH] GNU/kFreeBSD support

[Robert Millan]

On Sun, Aug 21, 2005 at 04:51:07PM +0200, Dominik 'Rathann' Mierzejewski wrote:
> On Sunday, 21 August 2005 at 15:50, Robert Millan wrote:
> > You wrote:
> > > On Fri, Aug 19, 2005 at 01:57:13PM +0200, Robert Millan wrote:
> > > > 
> > > > This patch adds support for a few features specific to kernel of FreeBSD, to
> > > > the GNU/kFreeBSD system:
> > > > 
> > > > http://glibc-bsd.alioth.debian.org/patches/upstream-only/mplayer.diff
> > > 
> > > Please attach short patches instead of sending links, this way we have
> > > everything in our archives.  I'd prefer to review this once the patch is
> > > on the list.
> > 
> > Ok, here you are.
> 
> Please explain a few details below.
> 
> > Author: rmh
> > Status: pending
> > Description: Enable misc kfreebsd-specific functionality.
> [...]
> > diff -ur MPlayer-1.0pre7.old/libmpdvdkit2/dvd_reader.c MPlayer-1.0pre7/libmpdvdkit2/dvd_reader.c
> > --- MPlayer-1.0pre7.old/libmpdvdkit2/dvd_reader.c	2005-03-11 03:40:28.000000000 +0100
> > +++ MPlayer-1.0pre7/libmpdvdkit2/dvd_reader.c	2005-08-05 18:44:36.000000000 +0200
> [...]
> > @@ -393,8 +393,8 @@
> >  	    }
> >  	    fclose( mntfile );
> >  	}
> > -#elif defined(__linux__)
> > -        mntfile = fopen( MOUNTED, "r" );
> > +#elif defined(__linux__) || defined(__GLIBC__)
> > +        mntfile = fopen(_PATH_MOUNTED, "r" );
> >          if( mntfile ) {
> >              struct mntent *me;
> >   
> 
> Why this change?

Because the code that follows (getmntent, etc) is Glibc-specific but not
Linux-specific.  GNU/kFreeBSD can use that.

> [...]
> > diff -ur MPlayer-1.0pre7.old/loader/pe_image.c MPlayer-1.0pre7/loader/pe_image.c
> > --- MPlayer-1.0pre7.old/loader/pe_image.c	2005-04-15 22:17:12.000000000 +0200
> > +++ MPlayer-1.0pre7/loader/pe_image.c	2005-08-05 18:49:33.000000000 +0200
> [...]
> > @@ -3280,7 +3280,7 @@
> >      {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}
> >  };
> >  
> > -static long WINAPI expCoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
> > +static long WINAPI expCoCreateInstance(GUID* rclsid, struct IUnknown* pUnkOuter,
> >  				       long dwClsContext, const GUID* riid, void** ppv)
> >  {
> >      int i;
> 
> And why this? I don't see any differences between the two lines.

Honestly, I don't know.  I suspect my editor silently messes up whitespace.

Just ignore this hunk :).

-- 
Robert Millan