From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 01:24:01 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 0B03E16A5DE; Sun,  3 Dec 2006 01:24:01 +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 DBC6816A5D5
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:24:00 +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 37F0143C9D
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:23:37 +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 kB31O0Zo001890
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 01:24:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31O0M7001885
	for perforce@freebsd.org; Sun, 3 Dec 2006 01:24:00 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 01:24:00 GMT
Message-Id: <200612030124.kB31O0M7001885@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 110909 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:24:01 -0000

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

Change 110909 by jb@jb_freebsd8 on 2006/12/03 01:23:08

	Reset to match OpenSolaris sources.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#6 edit

Differences ...

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

@@ -27,11 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
-#if defined(sun)
 #include <sys/sysmacros.h>
-#else
-#define	MIN(a, b)	((a) < (b) ? (a) : (b))
-#endif
 #include <strings.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -209,7 +205,7 @@
 
 ssize_t
 strtab_write(const strtab_t *sp,
-    STRTAB_COPY_FUNC func, void *priv)
+    ssize_t (*func)(const void *, size_t, void *), void *priv)
 {
 	ssize_t res, total = 0;
 	ulong_t i;