PERFORCE change 103947 for review

[John Birrell]

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

Change 103947 by jb at 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>