From owner-p4-projects@FreeBSD.ORG  Tue Apr 18 20:35:58 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 1466716A40E; Tue, 18 Apr 2006 20:35:58 +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 E4F7E16A404
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:35:57 +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 A663B43D69
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:35:54 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3IKZsoU064410
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:35:54 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IKZsKb064407
	for perforce@freebsd.org; Tue, 18 Apr 2006 20:35:54 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 18 Apr 2006 20:35:54 GMT
Message-Id: <200604182035.k3IKZsKb064407@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 95527 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, 18 Apr 2006 20:35:58 -0000

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

Change 95527 by jb@jb_freebsd2 on 2006/04/18 20:34:55

	Since this file is included in kernel code, it needs to include just
	kernel headers.
	
	Also, hide the #pragma so we get a clean compile.

Affected files ...

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

Differences ...

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

@@ -40,14 +40,18 @@
 #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 <elf.h>
+#include <machine/elf.h>
+#include <sys/elf32.h>
+#include <sys/elf64.h>
 #include <opensolaris/compat/sys/types.h>
 #include <opensolaris/compat/sys/elf.h>
 #endif