Add a #ifndef around the HAVE_ICONV settings since it is supplied

by the Makefile.
2015-08-10 00:53:45 +00:00 · 2015-08-10 00:53:45 +00:00 · 2e1f24485a
commit 2e1f24485a
parent 92ec33c978
1 changed files with 2 additions and 0 deletions
--- 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 */