PERFORCE change 96382 for review

[John Birrell]

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

Change 96382 by jb at jb_freebsd2 on 2006/04/29 23:23:03

	Remove compatibility includes that aren't required now that _SOLARIS_C_SOURCE
	can be defined to get those extra definitions out of the standard FreeBSD
	headers.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#5 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#6 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#7 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#8 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#5 (text) ====

@@ -44,8 +44,6 @@
 #include <signal.h>
 #if defined(sun)
 #include <alloca.h>
-#else
-#include <opensolaris/compat/sys/time.h>
 #endif
 #include <libgen.h>
 #if defined(sun)

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#3 (text) ====

@@ -42,10 +42,6 @@
 #include "decl.h"
 #include "msg.h"
 
-#if !defined(sun)
-#include <opensolaris/compat/sys/param.h>
-#endif
-
 /*
  * File input
  *	These functions read input files.

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 (text) ====

@@ -28,10 +28,6 @@
 
 #include <sys/types.h>
 
-#if	!defined(sun)
-#include	<opensolaris/compat/sys/types.h>
-#endif
-
 /*
  * function that will find a prime'ish number.  Usefull for
  * hashbuckets and related things.

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 (text) ====

@@ -79,10 +79,6 @@
 #include	<errno.h>
 #include	<sys/param.h>
 
-#if	!defined(sun)
-#include	<opensolaris/compat/sys/types.h>
-#endif
-
 #include	<sgs.h>
 #include	<string_table.h>
 

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 (text) ====

@@ -26,10 +26,6 @@
 
 #pragma ident	"@(#)string_table.c	1.5	06/03/07 SMI"
 
-#if	!defined(sun)
-#include	<opensolaris/compat/sys/types.h>
-#endif
-
 #include <string_table.h>
 #include <strings.h>
 #include <sgs.h>

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

@@ -37,7 +37,6 @@
 #else
 #include <sys/elf64.h>
 #include <link.h>
-#include <opensolaris/compat/sys/types.h>
 #include <opensolaris/compat/sys/elf.h>
 #include <opensolaris/compat/sys/link.h>
 #endif

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 (text) ====

@@ -31,7 +31,6 @@
 #include <sys/mman.h>
 #if	!defined(sun)
 #include <opensolaris/compat/sys/mman.h>
-#include <opensolaris/compat/sys/stat.h>
 #endif
 #include <ctf_impl.h>
 #include <unistd.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#7 (text) ====

@@ -36,11 +36,11 @@
 #include <opensolaris/compat/stdio.h>
 #include <opensolaris/compat/thread.h>
 #include <opensolaris/compat/unistd.h>
-#include <opensolaris/compat/sys/time.h>
 #include <opensolaris/compat/sys/bitmap.h>
 #include <opensolaris/compat/sys/objfs.h>
 #include <sys/utsname.h>
 #include <sys/ioccom.h>
+#include <sys/time.h>
 #endif
 #include <setjmp.h>
 #include <libctf.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#8 (text) ====

@@ -27,9 +27,6 @@
 #pragma ident	"@(#)dt_module.c	1.11	05/11/09 SMI"
 
 #include <sys/types.h>
-#if !defined(sun)
-#include <opensolaris/compat/sys/types.h>
-#endif
 #if defined(sun)
 #include <sys/modctl.h>
 #include <sys/kobj.h>
@@ -41,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/linker.h>
 #include <sys/stat.h>
-#include <opensolaris/compat/sys/stat.h>
 #endif
 
 #include <unistd.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#3 (text) ====

@@ -30,9 +30,6 @@
 #pragma ident	"@(#)dt_regset.h	1.2	05/06/08 SMI"
 
 #include <sys/types.h>
-#if !defined(sun)
-#include <opensolaris/compat/sys/types.h>
-#endif
 
 #ifdef	__cplusplus
 extern "C" {

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#3 (text) ====

@@ -30,9 +30,6 @@
 #pragma ident	"@(#)dt_strtab.h	1.3	05/06/08 SMI"
 
 #include <sys/types.h>
-#if !defined(sun)
-#include <opensolaris/compat/sys/types.h>
-#endif
 
 #ifdef	__cplusplus
 extern "C" {

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#3 (text) ====

@@ -36,8 +36,6 @@
 #include <sys/types.h>
 #if defined(sun)
 #include <sys/sysmacros.h>
-#else
-#include <opensolaris/compat/sys/types.h>
 #endif
 
 #include "hash.h"

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 (text) ====

@@ -30,7 +30,6 @@
 #if defined(sun)
 #include <sys/sysmacros.h>
 #else
-#include <opensolaris/compat/sys/types.h>
 #define	MIN(a, b)	((a) < (b) ? (a) : (b))
 #endif
 #include <strings.h>

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#4 (text) ====

@@ -95,7 +95,6 @@
 #include <sys/param.h>
 #if !defined(sun)
 #include <opensolaris/compat/assert.h>
-#include <opensolaris/compat/sys/types.h>
 #else
 #include <sys/debug.h>
 #endif