From owner-p4-projects@FreeBSD.ORG  Sun Oct 28 23:17:21 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DBEC16A52C; Sun, 28 Oct 2007 23:17:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6588A16A469
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:17:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 55D7513C491
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:17:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9SNHKdY063224
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 23:17:20 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SNHKAJ063220
	for perforce@freebsd.org; Sun, 28 Oct 2007 23:17:20 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 28 Oct 2007 23:17:20 GMT
Message-Id: <200710282317.l9SNHKAJ063220@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 128263 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, 28 Oct 2007 23:17:21 -0000

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

Change 128263 by jb@jb_freebsd1 on 2007/10/28 23:17:01

	Clean up the compatibility headers referenced.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#7 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#14 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#12 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#4 edit

Differences ...

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

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

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#7 (text) ====

@@ -30,16 +30,9 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/zmod.h>
-#if	!defined(sun)
-#include <opensolaris/compat/sys/mman.h>
-#endif
 #include <ctf_impl.h>
 #include <unistd.h>
 #include <fcntl.h>
-#if	!defined(sun)
-#include <opensolaris/compat/fcntl.h>
-#include <opensolaris/compat/unistd.h>
-#endif
 #include <errno.h>
 #include <dlfcn.h>
 #include <gelf.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#14 (text) ====

@@ -29,15 +29,9 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/param.h>
-#if defined(sun)
 #include <sys/objfs.h>
-#else
-#include <opensolaris/compat/fcntl.h>
-#include <opensolaris/compat/stdio.h>
-#include <opensolaris/compat/thread.h>
-#include <opensolaris/compat/unistd.h>
-#include <opensolaris/compat/sys/bitmap.h>
-#include <opensolaris/compat/sys/objfs.h>
+#if !defined(sun)
+#include <sys/bitmap.h>
 #include <sys/utsname.h>
 #include <sys/ioccom.h>
 #include <sys/time.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#12 (text) ====

@@ -50,6 +50,9 @@
 #include <assert.h>
 #include <errno.h>
 #include <dirent.h>
+#if !defined(sun)
+#include <fcntl.h>
+#endif
 
 #include <dt_strtab.h>
 #include <dt_module.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#4 (text) ====

@@ -27,11 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
-#if defined(sun)
 #include <sys/bitmap.h>
-#else
-#include <opensolaris/compat/sys/bitmap.h>
-#endif
 #include <assert.h>
 #include <strings.h>
 #include <stdlib.h>