dlls/ntdll/tape.c portability

Gerald Pfeifer gerald at pfeifer.com
Sat Feb 4 11:30:06 CST 2006


On Sat, 4 Feb 2006, Alexandre Julliard wrote:
>> ChangeLog:
>> Take into account that FreeBSD and others have MTSETBSIZ instead of
>> MTSETBLK and that struct mt_blksiz is laid out somewhat differently.
> Please add configure checks instead of #ifdef __FreeBSD__.

I considered that, but am not really happy about it, because configure
checks won't really be able to check the semantics of specific members
of the various structs, and see whether it meets what we think it does.
Checking for __FreeBSD__, on the other hand, solves this.

Regardless of this discussion, would you mind applying the following
part of my original patch?

Gerald


ChangeLog:
Take into account that FreeBSD and others have MTSETBSIZ instead of
MTSETBLK.

Index: tape.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tape.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 tape.c
--- tape.c	31 Jan 2006 12:08:47 -0000	1.3
+++ tape.c	3 Feb 2006 17:30:28 -0000
@@ -34,6 +34,10 @@
 #if !defined(MTCOMPRESSION) && defined(MTCOMP)
 #define MTCOMPRESSION MTCOMP
 #endif
+/* FreeBSD, for example, has MTSETBSIZ instead of MTSETBLK. */
+#if !defined(MTSETBLK) && defined(MTSETBSIZ)
+#define MTSETBLK MTSETBSIZ
+#endif
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT



More information about the wine-devel mailing list