From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:50:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F2116A4D2; Sun, 7 Dec 2003 13:50:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8CEA16A4CE for ; Sun, 7 Dec 2003 13:50:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C10FB43FDF for ; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB7Lo7XJ003624 for ; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB7Lo7xo003621 for perforce@freebsd.org; Sun, 7 Dec 2003 13:50:07 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 7 Dec 2003 13:50:07 -0800 (PST) Message-Id: <200312072150.hB7Lo7xo003621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 43577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2003 21:50:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=43577 Change 43577 by marcel@marcel_nfs on 2003/12/07 13:49:10 IFC @43575 + diff reduction that didn't happen in the previous submission. Affected files ... .. //depot/projects/ia64/include/dirent.h#8 integrate .. //depot/projects/ia64/include/locale.h#7 integrate .. //depot/projects/ia64/include/rpc/types.h#5 integrate .. //depot/projects/ia64/include/stddef.h#8 integrate .. //depot/projects/ia64/include/stdio.h#16 integrate .. //depot/projects/ia64/include/stdlib.h#24 integrate .. //depot/projects/ia64/include/string.h#13 integrate .. //depot/projects/ia64/include/time.h#13 integrate .. //depot/projects/ia64/include/unistd.h#23 integrate .. //depot/projects/ia64/include/wchar.h#17 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#9 integrate .. //depot/projects/ia64/share/man/man9/Makefile#36 integrate .. //depot/projects/ia64/share/man/man9/hexdump.9#1 branch .. //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#4 edit .. //depot/projects/ia64/sys/sys/_null.h#4 edit .. //depot/projects/ia64/sys/sys/ioctl_meteor.h#4 edit .. //depot/projects/ia64/usr.bin/uuidgen/Makefile#4 integrate Differences ... ==== //depot/projects/ia64/include/dirent.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.13 2002/09/10 18:12:16 mike Exp $ + * $FreeBSD: src/include/dirent.h,v 1.14 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _DIRENT_H_ ==== //depot/projects/ia64/include/locale.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)locale.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/locale.h,v 1.7 2002/10/09 09:19:27 tjr Exp $ + * $FreeBSD: src/include/locale.h,v 1.8 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _LOCALE_H_ ==== //depot/projects/ia64/include/rpc/types.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * * from: @(#)types.h 1.18 87/07/24 SMI * from: @(#)types.h 2.3 88/08/15 4.0 RPCSRC - * $FreeBSD: src/include/rpc/types.h,v 1.10 2001/03/19 12:49:47 alfred Exp $ + * $FreeBSD: src/include/rpc/types.h,v 1.11 2003/12/07 21:10:06 marcel Exp $ */ /* ==== //depot/projects/ia64/include/stddef.h#8 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)stddef.h 8.1 (Berkeley) 6/2/93 * - * $FreeBSD: src/include/stddef.h,v 1.9 2002/09/01 17:57:20 mike Exp $ + * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDDEF_H_ ==== //depot/projects/ia64/include/stdio.h#16 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.51 2003/01/13 08:41:47 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.52 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDIO_H_ ==== //depot/projects/ia64/include/stdlib.h#24 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.54 2003/06/25 19:06:40 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.55 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STDLIB_H_ ==== //depot/projects/ia64/include/string.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.18 2002/10/14 20:38:40 mike Exp $ + * $FreeBSD: src/include/string.h,v 1.19 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _STRING_H_ ==== //depot/projects/ia64/include/time.h#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.30 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _TIME_H_ ==== //depot/projects/ia64/include/unistd.h#23 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.69 2003/08/19 20:39:49 wollman Exp $ + * $FreeBSD: src/include/unistd.h,v 1.70 2003/12/07 21:10:06 marcel Exp $ */ #ifndef _UNISTD_H_ ==== //depot/projects/ia64/include/wchar.h#17 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ + * $FreeBSD: src/include/wchar.h,v 1.36 2003/12/07 21:10:06 marcel Exp $ */ /*- ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.11 2003/09/19 23:28:13 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.12 2003/12/07 20:47:33 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -237,7 +237,7 @@ kse_switchin(mc, (long)&tcb->tcb_tmbx, (long *)&kcb->kcb_kmbx.km_curthread); else - kse_switchin(mc, 0, NULL); + kse_switchin(mc, 0L, NULL); } else { if (setmbox) _ia64_restore_context(mc, (intptr_t)&tcb->tcb_tmbx, ==== //depot/projects/ia64/share/man/man9/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.209 2003/11/10 22:45:09 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.210 2003/12/07 20:48:00 scottl Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_CONFIG_INTR.9 BUS_PRINT_CHILD.9 \ @@ -49,6 +49,7 @@ get_cyclecount.9 \ getnewvnode.9 \ groupmember.9 \ + hexdump.9 \ ifnet.9 inittodr.9 intro.9 ithread.9 \ jumbo.9 \ kernacc.9 kobj.9 kthread.9 ktr.9 \ ==== //depot/projects/ia64/sys/alpha/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.1 2000/04/15 08:07:56 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.3 2003/12/07 06:37:31 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/i386/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/i386/include/ioctl_meteor.h,v 1.13 2003/12/07 06:37:32 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/ia64/include/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/ioctl_meteor.h,v 1.1 2000/09/29 13:46:05 dfr Exp $ + * $FreeBSD: src/sys/ia64/include/ioctl_meteor.h,v 1.3 2003/12/07 06:37:32 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/sys/sys/_null.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/_null.h,v 1.1 2003/12/07 21:10:06 marcel Exp $ */ #ifndef NULL ==== //depot/projects/ia64/sys/sys/ioctl_meteor.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/ioctl_meteor.h,v 1.11 1999/12/29 04:33:02 peter Exp $ + * $FreeBSD: src/sys/sys/ioctl_meteor.h,v 1.13 2003/12/07 06:37:31 imp Exp $ */ /* * ioctl constants for Matrox Meteor Capture card. ==== //depot/projects/ia64/usr.bin/uuidgen/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.1 2002/05/28 06:16:08 marcel Exp $ +# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.2 2003/12/07 21:34:56 mux Exp $ PROG= uuidgen -WARNS?= 4 +WARNS?= 6 .include