From owner-p4-projects@FreeBSD.ORG  Wed Apr 12 23:28:13 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 E62C416A446; Wed, 12 Apr 2006 23:28:12 +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 A7C4C16A401
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:28:12 +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 7593E43D45
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:28:12 +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 k3CNSCf4072253
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 23:28:12 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3CNSCGi072250
	for perforce@freebsd.org; Wed, 12 Apr 2006 23:28:12 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Apr 2006 23:28:12 GMT
Message-Id: <200604122328.k3CNSCGi072250@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 95112 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: Wed, 12 Apr 2006 23:28:13 -0000

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

Change 95112 by jb@jb_freebsd2 on 2006/04/12 23:27:30

	A few definitions here clash with FreeBSD's definitions in sys/link_elf.h
	
	For the time being preprocess out the ones in OpenSolaris.
	
	This will need to be revisited later.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/link.h#2 edit

Differences ...

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

@@ -422,6 +422,7 @@
 
 typedef struct link_map	Link_map;
 
+#if	!defined(__FreeBSD__)
 struct link_map {
 	unsigned long	l_addr;		/* address at which object is mapped */
 	char 		*l_name;	/* full name of loaded object */
@@ -434,6 +435,7 @@
 	Link_map	*l_prev;	/* previous link object */
 	char		*l_refname;	/* filters reference name */
 };
+#endif
 
 #ifdef _SYSCALL32
 typedef struct link_map32 Link_map32;
@@ -448,11 +450,13 @@
 };
 #endif
 
+#if	!defined(__FreeBSD__)
 typedef enum {
 	RT_CONSISTENT,
 	RT_ADD,
 	RT_DELETE
 } r_state_e;
+#endif
 
 typedef enum {
 	RD_FL_NONE = 0,		/* no flags */
@@ -473,6 +477,7 @@
 	RD_DLACTIVITY		/* a dlopen or dlclose has happened */
 } rd_event_e;
 
+#if	!defined(__FreeBSD__)
 struct r_debug {
 	int		r_version;	/* debugging info version no. */
 	Link_map	*r_map;		/* address of link_map */
@@ -483,6 +488,7 @@
 	rd_event_e	r_rdevent;	/* debug event */
 	rd_flags_e	r_flags;	/* misc flags. */
 };
+#endif
 
 #ifdef _SYSCALL32
 struct r_debug32 {