From owner-svn-src-stable@FreeBSD.ORG  Thu Dec 19 21:03:09 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3F1B71A4;
 Thu, 19 Dec 2013 21:03:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A7BF18D9;
 Thu, 19 Dec 2013 21:03:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJL396Z006403;
 Thu, 19 Dec 2013 21:03:09 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJL39fS006402;
 Thu, 19 Dec 2013 21:03:09 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201312192103.rBJL39fS006402@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 19 Dec 2013 21:03:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r259631 - stable/10/contrib/jemalloc/include/jemalloc
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2013 21:03:09 -0000

Author: peter
Date: Thu Dec 19 21:03:08 2013
New Revision: 259631
URL: http://svnweb.freebsd.org/changeset/base/259631

Log:
  MF9: Don't fail to build if MALLOC_PRODUCTION is defined in make.conf

Modified:
  stable/10/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h

Modified: stable/10/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- stable/10/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Thu Dec 19 20:26:06 2013	(r259630)
+++ stable/10/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Thu Dec 19 21:03:08 2013	(r259631)
@@ -4,7 +4,9 @@
 
 #undef JEMALLOC_OVERRIDE_VALLOC
 
+#ifndef MALLOC_PRODUCTION
 #define	MALLOC_PRODUCTION
+#endif
 
 #ifndef MALLOC_PRODUCTION
 #define	JEMALLOC_DEBUG