PERFORCE change 128263 for review

[John Birrell]

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

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