From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:33:54 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 E043416A4DF; Tue, 15 Aug 2006 02:33:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 AE77416A4DA
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:33:53 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 48B2F43D6B
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:33:53 +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 k7F2Xrs2084203
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:33:53 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Xr8s084200
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:33:53 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:33:53 GMT
Message-Id: <200608150233.k7F2Xr8s084200@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 103952 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: Tue, 15 Aug 2006 02:33:54 -0000

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

Change 103952 by jb@jb_freebsd2 on 2006/08/15 02:33:08

	Just use FreeBSD's ELF header files from now on.
	
	Fix a compiler warning.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#7 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#7 (text) ====

@@ -40,20 +40,11 @@
 #ifndef	_CTF_API_H
 #define	_CTF_API_H
 
-#if	defined(sun)
 #pragma ident	"@(#)ctf_api.h	1.4	05/06/08 SMI"
-#endif
 
 #include <sys/types.h>
 #include <sys/param.h>
-#if	defined(sun)
 #include <sys/elf.h>
-#else
-#include <machine/elf.h>
-#include <sys/elf32.h>
-#include <sys/elf64.h>
-#include <opensolaris/compat/sys/elf.h>
-#endif
 #include <sys/ctf.h>
 
 #ifdef	__cplusplus
@@ -74,7 +65,7 @@
  * filling in ctf_sect_t structures and passing them to ctf_bufopen():
  */
 typedef struct ctf_sect {
-	const char *cts_name;	/* section name (if any) */
+	char *cts_name;		/* section name (if any) */
 	ulong_t cts_type;	/* section type (ELF SHT_... value) */
 	ulong_t cts_flags;	/* section flags (ELF SHF_... value) */
 #if defined(sun)