From owner-cvs-all@FreeBSD.ORG Sat Dec 20 13:53:44 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 876F716A4CE for ; Sat, 20 Dec 2003 13:53:44 -0800 (PST) Received: from mail3.speakeasy.net (mail3.speakeasy.net [216.254.0.203]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4618543D64 for ; Sat, 20 Dec 2003 13:53:36 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 10193 invoked from network); 20 Dec 2003 14:46:11 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 20 Dec 2003 14:46:11 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id hBKEk4M0036293; Sat, 20 Dec 2003 09:46:05 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <867k0rnbab.wl@gray.plala.or.jp> Date: Sat, 20 Dec 2003 09:46:16 -0500 (EST) From: John Baldwin To: FUJISHIMA Satsuki X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: "David E. O'Brien" 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 ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2003 21:53:44 -0000 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) /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 , > it #defines _MACHINE_IOCTL_BT848_H_ before >#including so entire definition in > 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 <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/