Amarok 1.4.5 Solaris 10 x86

[Jeff Mitchell]

Ed--

On my bog standard Linux system d->d_fd is junk.  So I added an #ifdef 
USE_SOLARIS which I think it correct.  Can you please test SVN (stable 
branch, not trunk) and tell me if it works for you?  Committed in r640596.

Thanks,
Jeff

On Wednesday 07 March 2007, Edd Barrett wrote:
> Hi Guys,
>
> On 3/2/07, Edd Barrett <vext01 at gmail.com> wrote:
> > 2) dirfd() is not available in solaris. You need to provide a
> > replacement function using autoconf. Here is a kludge that I used,
> > just to get a build. I'm not suggesting this be imported because its
> > not in any way shape or form portable. But it did get me an amarok
> > binary for solaris :P
> >
> > --- amarok/src/collectionscanner/collectionscanner.cpp  Thu Feb  1
> > 18:14:17 2007 +++
> > /opt/ourbuilds/src/amarok-1.4.5/amarok/src/collectionscanner/collectionsc
> >anner.cpp Fri Mar  2 22:08:02 2007
> > @@ -182,7 +182,7 @@
> >          warning() << "Skipping, " << strerror(errno) << ": " << dir <<
> > endl; return;
> >      }
> > -    int dfd = dirfd(d);
> > +    int dfd = d->d_fd;
> >      if (dfd == -1) {
> >         warning() << "Skipping, unable to obtain file descriptor: " <<
> > dir << endl;
> >         closedir(d);
>
> I have researched this (spoke to my lecturer), and the struct returned
> by opendir is POSIX compatible. Ie it should be the same for all POSIX
> compatible os's. Therefore this patch is infact a bugfix.
>
> Would you agree?