From owner-p4-projects@FreeBSD.ORG  Thu Apr 13 00:07:05 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 8C1EE16A408; Thu, 13 Apr 2006 00:07:05 +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 6C6BB16A402
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 00:07:05 +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 C601043D66
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 00:07:02 +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 k3D072XB094659
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 00:07:02 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3D072WL094656
	for perforce@freebsd.org; Thu, 13 Apr 2006 00:07:02 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 13 Apr 2006 00:07:02 GMT
Message-Id: <200604130007.k3D072WL094656@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 95119 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 00:07:05 -0000

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

Change 95119 by jb@jb_freebsd2 on 2006/04/13 00:06:24

	Solaris uses malloc.h. We use stdlib.h.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#2 (text) ====

@@ -39,7 +39,11 @@
 #include <setjmp.h>
 #include <assert.h>
 #include <string.h>
+#if defined(sun)
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include "elf_dem.h"
 #include "String.h"