From owner-svn-src-head@freebsd.org  Mon Aug 10 00:53:46 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4BA0099ED51;
 Mon, 10 Aug 2015 00:53:46 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3280F2B6;
 Mon, 10 Aug 2015 00:53:46 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7A0rkZj032910;
 Mon, 10 Aug 2015 00:53:46 GMT (envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7A0rkeM032909;
 Mon, 10 Aug 2015 00:53:46 GMT (envelope-from peter@FreeBSD.org)
Message-Id: <201508100053.t7A0rkeM032909@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: peter set sender to
 peter@FreeBSD.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 10 Aug 2015 00:53:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286562 - head/usr.bin/svn/lib/libapr_util
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Aug 2015 00:53:46 -0000

Author: peter
Date: Mon Aug 10 00:53:45 2015
New Revision: 286562
URL: https://svnweb.freebsd.org/changeset/base/286562

Log:
  Add a #ifndef around the HAVE_ICONV settings since it is supplied
  by the Makefile.

Modified:
  head/usr.bin/svn/lib/libapr_util/apu.h

Modified: head/usr.bin/svn/lib/libapr_util/apu.h
==============================================================================
--- head/usr.bin/svn/lib/libapr_util/apu.h	Mon Aug 10 00:46:24 2015	(r286561)
+++ head/usr.bin/svn/lib/libapr_util/apu.h	Mon Aug 10 00:53:45 2015	(r286562)
@@ -122,7 +122,9 @@
 #define APU_HAVE_NSS           0
 
 #define APU_HAVE_APR_ICONV     0
+#ifndef APU_HAVE_ICONV
 #define APU_HAVE_ICONV         0
+#endif
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */