PERFORCE change 95201 for review

[John Birrell]

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

Change 95201 by jb at jb_freebsd2 on 2006/04/14 01:01:11

	Include compatibility headers to get Sun's extensions.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#5 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#5 (text) ====

@@ -30,38 +30,16 @@
 #pragma ident	"@(#)gelf.h	1.14	05/06/08 SMI"
 
 #include <sys/feature_tests.h>
+#include <libelf.h>
 
-#include <libelf.h>
 #if defined(sun)
 #include <sys/link.h>
 #else
-#include <opensolaris/compat/sys/types.h>
 #include <sys/elf64.h>
 #include <link.h>
-
-/*
- * Non Sun ELF implementations don't have these.
- * Where is the standard that defines them?
- */
-typedef   unsigned long long      Elf64_Lword;
-typedef struct {
-    Elf64_Lword m_value;    /* symbol value */
-    Elf64_Xword     m_info;     /* size + index */
-    Elf64_Xword m_poffset;  /* symbol offset */
-    Elf64_Half  m_repeat;   /* repeat count */
-    Elf64_Half  m_stride;   /* stride info */
-} Elf64_Move;
-typedef struct {
-    Elf64_Xword c_tag;      /* how to interpret value */
-    union {
-        Elf64_Xword c_val;
-        Elf64_Addr  c_ptr;
-    } c_un;
-} Elf64_Cap;
-typedef struct {
-    Elf64_Half  si_boundto; /* direct bindings - symbol bound to */
-    Elf64_Half  si_flags;   /* per symbol flags */
-} Elf64_Syminfo;
+#include <opensolaris/compat/sys/types.h>
+#include <opensolaris/compat/sys/elf.h>
+#include <opensolaris/compat/sys/link.h>
 #endif
 
 /*