PERFORCE change 95188 for review

[John Birrell]

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

Change 95188 by jb at jb_freebsd2 on 2006/04/13 22:41:49

	Don't include malloc.h where stdlib.h is already included.

Affected files ...

.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#2 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#2 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#2 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#2 (text) ====

@@ -41,7 +41,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#if defined(sun)
 #include <malloc.h>
+#endif
 
 /*
     These files are included to get the sizes

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#2 (text) ====

@@ -61,7 +61,9 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
+#if defined(sun)
 #include <malloc.h>
+#endif
 
 #include "dwarf_incl.h"
 

==== //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#2 (text) ====

@@ -43,7 +43,9 @@
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+#if defined(sun)
 #include <malloc.h>
+#endif
 
 #define MINIMUM_POSSIBLE_PROLOG_LEN 10  /* 10 is  based on */
 	/*  the definition of the DWARF2/3 line table prolog.

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

@@ -27,6 +27,10 @@
 #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
+#ifdef DOODAD
 #include <sys/modctl.h>
 #include <sys/kobj.h>
 #include <sys/kobj_impl.h>
@@ -43,6 +47,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <dirent.h>
+#endif
 
 #include <dt_strtab.h>
 #include <dt_module.h>