PATCH: /dlls/ntdll/cdrom.c -- portability breakage
Gerald Pfeifer
pfeifer at dbai.tuwien.ac.at
Tue Mar 25 03:53:01 CST 2003
How about the following patch?
It's needed for compilation on FreeBSD; in case it's not correct,
how should we solve the problem?
On Fri, 14 Mar 2003, Gerald Pfeifer wrote:
> Thanks for your quick response! I noticed that Alexandre has applied
> the patch with the improvement you suggested (so also thanks to him). ;-)
>
> Unfortunately, I missed one detail: CDROM_MSF is not defined on FreeBSD;
> I'm not sure whether the following really is correct, but FWIW it fixes
> compilation.
>
> Gerald (who had been offline for three weeks)
>
> ChangeLog:
> Only use CDROM_MSF is defined.
>
> Index: cdrom.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
> retrieving revision 1.26
> diff -u -3 -p -r1.26 cdrom.c
> --- cdrom.c 25 Feb 2003 03:56:21 -0000 1.26
> +++ cdrom.c 14 Mar 2003 17:51:33 -0000
> @@ -1045,7 +1045,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
> if (i <= toc.FirstTrack || i > toc.LastTrack+1)
> return STATUS_INVALID_PARAMETER;
> i--;
> - cp->FormatCode = CDROM_MSF;
> +#ifdef CDROM_MSF
> + cp->FormatCode = CDROM_MSF;
> +#endif
> cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
> cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
> cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
>
More information about the wine-patches
mailing list