From 2e1f24485ad28a113dc26a6d848dae1a2440961c Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 10 Aug 2015 00:53:45 +0000 Subject: [PATCH] Add a #ifndef around the HAVE_ICONV settings since it is supplied by the Makefile. --- usr.bin/svn/lib/libapr_util/apu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/svn/lib/libapr_util/apu.h b/usr.bin/svn/lib/libapr_util/apu.h index 4631ae704a66..575d633162d7 100644 --- a/usr.bin/svn/lib/libapr_util/apu.h +++ b/usr.bin/svn/lib/libapr_util/apu.h @@ -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 */