svn commit: r286562 - head/usr.bin/svn/lib/libapr_util

[Peter Wemm]

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 */