From owner-svn-src-all@FreeBSD.ORG  Thu Jul  4 14:26:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9F0F417E;
 Thu,  4 Jul 2013 14:26:42 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8F3B518D3;
 Thu,  4 Jul 2013 14:26:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r64EQgpu026433;
 Thu, 4 Jul 2013 14:26:42 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r64EQgA0026432;
 Thu, 4 Jul 2013 14:26:42 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201307041426.r64EQgA0026432@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 4 Jul 2013 14:26:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252699 - stable/9/lib/libc/stdlib
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jul 2013 14:26:42 -0000

Author: des
Date: Thu Jul  4 14:26:42 2013
New Revision: 252699
URL: http://svnweb.freebsd.org/changeset/base/252699

Log:
  Protect the #define MALLOC_PRODUCTION directive in case it was also
  defined on the command line (due to MALLOC_PRODUCTION=yes in src.conf).

Modified:
  stable/9/lib/libc/stdlib/malloc.c

Modified: stable/9/lib/libc/stdlib/malloc.c
==============================================================================
--- stable/9/lib/libc/stdlib/malloc.c	Thu Jul  4 12:35:39 2013	(r252698)
+++ stable/9/lib/libc/stdlib/malloc.c	Thu Jul  4 14:26:42 2013	(r252699)
@@ -123,7 +123,9 @@
  * defaults the A and J runtime options to off.  These settings are appropriate
  * for production systems.
  */
+#ifndef MALLOC_PRODUCTION
 #define	MALLOC_PRODUCTION
+#endif
 
 #ifndef MALLOC_PRODUCTION
    /*