From owner-p4-projects@FreeBSD.ORG  Thu Apr 13 22:42:31 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C58C516A52F; Thu, 13 Apr 2006 22:42:30 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 667FD16A52C
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:42:30 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2A6DB43D5D
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:42:30 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3DMgUPo084231
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:42:30 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMgTa1084220
	for perforce@freebsd.org; Thu, 13 Apr 2006 22:42:29 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 13 Apr 2006 22:42:29 GMT
Message-Id: <200604132242.k3DMgTa1084220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95188 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Apr 2006 22:42:31 -0000

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

Change 95188 by jb@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>