From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:24:39 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 2C48916A4E1; Tue, 15 Aug 2006 02:24:39 +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 0B42B16A4DA
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:24:39 +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 B47E743D46
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:24:38 +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 k7F2OcYm083529
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:24:38 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Occe083526
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:24:38 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:24:38 GMT
Message-Id: <200608150224.k7F2Occe083526@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 103947 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:24:39 -0000

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

Change 103947 by jb@jb_freebsd2 on 2006/08/15 02:24:06

	Use only FreeBSD ELF headers from now on.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#3 edit

Differences ...

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

@@ -39,7 +39,11 @@
 #endif
 
 #include <sys/types.h>
+#if defined(sun)
 #include <sys/machelf.h>
+#else
+#include <elf.h>
+#endif
 
 #define	ALO_DATA	(sizeof (Alist) - sizeof (void *))
 

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

@@ -35,7 +35,6 @@
 
 #pragma ident	"@(#)sgs.h	1.53	06/05/09 SMI"
 
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -49,7 +48,11 @@
 
 #ifndef	_ASM
 #include <sys/types.h>
+#if defined(sun)
 #include <sys/machelf.h>
+#else
+#include <elf.h>
+#endif
 #include <stdlib.h>
 #include <libelf.h>
 #include <assert.h>