From owner-p4-projects@FreeBSD.ORG  Sun Dec  3 01:22:59 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 2CE0A16A415; Sun,  3 Dec 2006 01:22:59 +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 E302616A40F
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:22:58 +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 3F83643CA3
	for <perforce@freebsd.org>; Sun,  3 Dec 2006 01:22:35 +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 kB31MwlF001496
	for <perforce@freebsd.org>; Sun, 3 Dec 2006 01:22:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB31MwK3001493
	for perforce@freebsd.org; Sun, 3 Dec 2006 01:22:58 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 3 Dec 2006 01:22:58 GMT
Message-Id: <200612030122.kB31MwK3001493@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 110908 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:22:59 -0000

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

Change 110908 by jb@jb_freebsd8 on 2006/12/03 01:22:43

	Reset to match OpenSolaris sources.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#4 edit

Differences ...

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

@@ -54,14 +54,12 @@
 	size_t str_size;		/* total size of strings in bytes */
 } strtab_t;
 
-typedef ssize_t STRTAB_COPY_FUNC(void *, size_t, void *);
-
 extern void strtab_create(strtab_t *);
 extern void strtab_destroy(strtab_t *);
 extern size_t strtab_insert(strtab_t *, const char *);
 extern size_t strtab_size(const strtab_t *);
 extern ssize_t strtab_write(const strtab_t *,
-    STRTAB_COPY_FUNC, void *);
+    ssize_t (*)(const void *, size_t, void *), void *);
 extern void strtab_print(const strtab_t *);
 
 #ifdef	__cplusplus