From owner-p4-projects@FreeBSD.ORG  Sun Jul  2 20:52:45 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 1435916A417; Sun,  2 Jul 2006 20:52:45 +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 DF2F016A407
	for <perforce@freebsd.org>; Sun,  2 Jul 2006 20:52:44 +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 4FDAA43D81
	for <perforce@freebsd.org>; Sun,  2 Jul 2006 20:52:37 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k62KqbUp082440
	for <perforce@freebsd.org>; Sun, 2 Jul 2006 20:52:37 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k62KqakZ082437
	for perforce@freebsd.org; Sun, 2 Jul 2006 20:52:36 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 2 Jul 2006 20:52:36 GMT
Message-Id: <200607022052.k62KqakZ082437@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 100447 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: Sun, 02 Jul 2006 20:52:45 -0000

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

Change 100447 by jb@jb_freebsd2 on 2006/07/02 20:51:57

	Use GNU configure-style #ifdefs to avoid including malloc.h when we
	don't want it.

Affected files ...

.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_alloc.c#4 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_init_finish.c#5 edit
.. //depot/projects/dtrace/src/contrib/libdwarf/dwarf_sort_line.c#4 edit

Differences ...

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

@@ -41,7 +41,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 /*
     These files are included to get the sizes

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

@@ -57,7 +57,9 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "dwarf_incl.h"
 

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

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