From owner-cvs-all@FreeBSD.ORG Sat Dec 20 00:28:26 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 5887C16A4CF; Sat, 20 Dec 2003 00:28:26 -0800 (PST) Received: from i170119.ap.plala.or.jp (i170119.ap.plala.or.jp [218.47.170.119]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17D5D43D58; Sat, 20 Dec 2003 00:28:18 -0800 (PST) (envelope-from sf@FreeBSD.org) Date: Sat, 20 Dec 2003 17:28:12 +0900 Message-ID: <867k0rnbab.wl@gray.plala.or.jp> From: FUJISHIMA Satsuki To: "David E. O'Brien" In-Reply-To: <200312080722.hB87MgWZ046879@repoman.freebsd.org> References: <200312080722.hB87MgWZ046879@repoman.freebsd.org> Mail-Followup-To: "David E. O'Brien" , src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 Emacs/20.7 (i386--freebsd) MULE/4.1 (AOI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII cc: cvs-src@FreeBSD.org cc: src-committers@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 ... 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 08:28:26 -0000 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. Index: src/sys/alpha/include/ioctl_bt848.h =================================================================== RCS file: /home/ncvs/src/sys/alpha/include/ioctl_bt848.h,v retrieving revision 1.3 diff -u -r1.3 ioctl_bt848.h --- src/sys/alpha/include/ioctl_bt848.h 8 Dec 2003 07:22:41 -0000 1.3 +++ src/sys/alpha/include/ioctl_bt848.h 20 Dec 2003 07:38:28 -0000 @@ -26,13 +26,8 @@ * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ - #ifdef __GNUC__ #warning Include dev/bktr/ioctl_bt848.h instead of this header. #endif #include - -#endif /* _MACHINE_IOCTL_BT848_H_ */ Index: src/sys/alpha/include/ioctl_meteor.h =================================================================== RCS file: /home/ncvs/src/sys/alpha/include/ioctl_meteor.h,v retrieving revision 1.4 diff -u -r1.4 ioctl_meteor.h --- src/sys/alpha/include/ioctl_meteor.h 8 Dec 2003 07:22:41 -0000 1.4 +++ src/sys/alpha/include/ioctl_meteor.h 20 Dec 2003 07:38:35 -0000 @@ -26,13 +26,8 @@ * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_METEOR_H_ -#define _MACHINE_IOCTL_METEOR_H_ - #ifdef __GNUC__ #warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif #include - -#endif /* _MACHINE_IOCTL_METEOR_H_ */ Index: src/sys/i386/include/ioctl_bt848.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/ioctl_bt848.h,v retrieving revision 1.29 diff -u -r1.29 ioctl_bt848.h --- src/sys/i386/include/ioctl_bt848.h 8 Dec 2003 07:22:41 -0000 1.29 +++ src/sys/i386/include/ioctl_bt848.h 20 Dec 2003 07:38:17 -0000 @@ -26,13 +26,8 @@ * $FreeBSD: src/sys/i386/include/ioctl_bt848.h,v 1.29 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ - #ifdef __GNUC__ #warning Include dev/bktr/ioctl_bt848.h instead of this header. #endif #include - -#endif /* _MACHINE_IOCTL_BT848_H_ */ Index: src/sys/i386/include/ioctl_meteor.h =================================================================== RCS file: /home/ncvs/src/sys/i386/include/ioctl_meteor.h,v retrieving revision 1.14 diff -u -r1.14 ioctl_meteor.h --- src/sys/i386/include/ioctl_meteor.h 8 Dec 2003 07:22:41 -0000 1.14 +++ src/sys/i386/include/ioctl_meteor.h 20 Dec 2003 07:38:53 -0000 @@ -26,13 +26,8 @@ * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.14 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_METEOR_H_ -#define _MACHINE_IOCTL_METEOR_H_ - #ifdef __GNUC__ #warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif #include - -#endif /* _MACHINE_IOCTL_METEOR_H_ */