Date: Sat, 20 Dec 2003 09:46:16 -0500 (EST) From: John Baldwin <jhb@FreeBSD.org> To: FUJISHIMA Satsuki <sf@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/alpha/include ioctl_bt848.h ioctl_meteor.h src/sys/i386/include ioctl_bt848.h ioctl_meteor.h src/include Makefile src/etc/mtree BSD.include.dist src/share/examples/meteor rgb16.c rgb24.c test-n.c yuvpk.c yuvpl.c src/sys/ia64/include ... Message-ID: <XFMail.20031220094616.jhb@FreeBSD.org> In-Reply-To: <867k0rnbab.wl@gray.plala.or.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
On 20-Dec-2003 FUJISHIMA Satsuki wrote:
> At Sun, 7 Dec 2003 23:22:42 -0800 (PST),
> David O'Brien wrote:
>>
>> obrien 2003/12/07 23:22:42 PST
>>
>> FreeBSD src repository
>>
>> Modified files:
>> sys/alpha/include ioctl_bt848.h ioctl_meteor.h
>> sys/i386/include ioctl_bt848.h ioctl_meteor.h
>> include Makefile
>> etc/mtree BSD.include.dist
>> share/examples/meteor rgb16.c rgb24.c test-n.c yuvpk.c yuvpl.c
>> Removed files:
>> sys/ia64/include ioctl_bt848.h ioctl_meteor.h
>> Log:
>> Move the bktr(4) <arch>/include/ioctl_{bt848,meteor}.h files to dev/bktr
>> as these ioctl's aren't MD. This also means they are installed in
>> /usr/include/dev/bktr now. Also provide compatability wrappers for
>> where these headers lived in 4.x.
>
> These compatibility wrappers don't work.
>
> When you #include <machine/ioctl_xx.h>,
> it #defines _MACHINE_IOCTL_BT848_H_ before
>#including <dev/bktr/ioctl_xx.h> so entire definition in
> <dev/bktr/ioctl_xx.h> would not be read.
>
> This broke ffmpeg-0.4.8 compilation like this:
> ....
> cc -O -pipe -march=pentium3 -I/usr/local/include -I/usr/X11R6/include -Wall -I..
> -I/usr/obj/ports/ffmpeg/work/ffmpeg-0.4.8 -I/usr/obj/ports/ffmpeg/work/ffmpeg-0.4.8/libavcodec
> -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c -o grab_bsdbktr.o
> grab_bsdbktr.c
> In file included from grab_bsdbktr.c:27:
> /usr/include/machine/ioctl_meteor.h:33:2: warning: #warning Include dev/bktr/ioctl_meteor.h
> instead of this header.
> In file included from grab_bsdbktr.c:28:
> /usr/include/machine/ioctl_bt848.h:33:2: warning: #warning Include dev/bktr/ioctl_bt848.h instead
> of this header.
> grab_bsdbktr.c:66: error: `METEOR_DEV0' undeclared here (not in a function)
> grab_bsdbktr.c:66: error: initializer element is not constant
> grab_bsdbktr.c:66: error: (near initialization for `bktr_dev[0]')
> grab_bsdbktr.c:66: error: `METEOR_DEV1' undeclared here (not in a function)
> grab_bsdbktr.c:66: error: initializer element is not constant
> grab_bsdbktr.c:66: error: (near initialization for `bktr_dev[1]')
> ....
>
> I think these ifndef's are redundant.
Either that or the dev/bktr file should use a different one than
MACHINE now that it lives in a different directory.
--
John Baldwin <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20031220094616.jhb>