From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 01:08:35 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5E37216A415; Sun,  3 Dec 2006 01:08:35 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3CD7016A403
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:08:35 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9CF1643C9D
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:08:11 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB318YBg098730
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 01:08:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB318Y7I098727
	for perforce@freebsd.org; Sun, 3 Dec 2006 01:08:34 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 01:08:34 GMT
Message-Id: <200612030108.kB318Y7I098727@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110903 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Dec 2006 01:08:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=110903

Change 110903 by jb@jb_freebsd8 on 2006/12/03 01:08:18

	IFprojects_opensolaris. (loop back)

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#4 integrate
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#4 integrate
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#8 integrate
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#4 integrate

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#4 (text) ====


==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#4 (text) ====


==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#8 (text) ====


==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#4 (text) ====

@@ -769,9 +769,6 @@
 static int
 print_usage(FILE *fp, int verbose)
 {
-#if !defined(sun)
-#define getpname	getprogname
-#endif
 	(void) fprintf(fp, "Usage: %s [-dfhlsSt] [-u file] file\n", getpname());
 
 	if (verbose) {