Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jul 2013 14:26:42 +0000 (UTC)
From:      Dag-Erling Smørgrav <des@FreeBSD.org>
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
Message-ID:  <201307041426.r64EQgA0026432@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
    /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041426.r64EQgA0026432>