Date: Wed, 12 Apr 2006 23:28:12 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 95112 for review Message-ID: <200604122328.k3CNSCGi072250@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604122328.k3CNSCGi072250>