It changes some "defined (__FreeBSD__)" into "defined (__FreeBSD_kernel__)"
and "__FreeBSD_version" into "__FreeBSD_kernel_version".

The changes are performed on places, where feature of kernel is tested. On
some other places, feature of userland/libc is tested, on them "defined
(__FreeBSD__)" remains.

As proposed, include/configure.h cause __FreeBSD_kernel__ be defined if
__FreeBSD__ is defined.

--HG--
extra : transplant_source : %25%96K%05%E4Y%B15%94%60%15%FE1%8Ah%26Xy%8C/

--HG--
extra : transplant_source : %E0%D0%C5%8B%BEU%DD%24%5D7%1F%ADV%AD%EB%23%CBU%80%EB

For contributed code, leave whatever the version we last synced for is using
to make simpler future syncs.

>
> /* Special codes used when specifying changer slots. */
> #define CDSL_NONE               (INT_MAX-1)
> #define CDSL_CURRENT            INT_MAX

According to bug 1773769, this breaks foo->open().
The fix (as used in Ville Skyttä's patch, which doesn't cover all cases) is
to replace this with (foo->open)().

This patch was generated using
sed -i -re 's/(([[:alnum:]_]+(->|\.))+open) ?\(/(\1) (/' `grep '[>.]open \?(' include -rIl`
One change (in a comment) is not committed.

Some plugins may have been missed due to them not being built here.

 development branche
Am Samstag, 26. Mai 2007 17:48 schrieb Darren Salt:

> Could you also try not reverting that and instead applying one or
> both of the attached patches? Both playback and eject need to be
> tested. You should use the drive's eject button, though there's no
> harm in also checking xine-lib's eject code.

Ok, here's a modified patch, a combination of your two patches, with a
little fix. It works fine here, pressing the vcd button on xine-ui
starts playing vcd's directly and when pressing the stop button, I can
eject the CD by pressing the eject button on the cd drive.

I hope it's ok for you.

--
Machs gut    | http://www.iivs.de/schwinde/buerger/tremmel/
             | http://packman.links2linux.de/
Manfred      | http://www.knightsoft-net.de