summaryrefslogtreecommitdiff
path: root/source4/include/system/iconv.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-13 17:13:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:57 -0500
commit089cbd4a8e8108306ba92b01746ecd261e9fdd7c (patch)
tree40dcac0af3f7f45aa0bd1857c419d115138f16dc /source4/include/system/iconv.h
parent8afca7791c2e797dc6f2a491b02fbb2daa26f52c (diff)
downloadsamba-089cbd4a8e8108306ba92b01746ecd261e9fdd7c.tar.gz
samba-089cbd4a8e8108306ba92b01746ecd261e9fdd7c.tar.bz2
samba-089cbd4a8e8108306ba92b01746ecd261e9fdd7c.zip
r15568: Simplify detection of iconv libraries a fair bit and fix it to
work on FreeBSD. Based very loosely on a patch by Timur Bakevey Fixes #3688 (This used to be commit ea7b28572b453da8eced565a49e4c10e7ebd2e28)
Diffstat (limited to 'source4/include/system/iconv.h')
-rw-r--r--source4/include/system/iconv.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
index a0c1c18fa2..d9111bb07e 100644
--- a/source4/include/system/iconv.h
+++ b/source4/include/system/iconv.h
@@ -20,14 +20,12 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV_H
#include <iconv.h>
#endif
-#ifdef HAVE_GICONV
+#ifdef HAVE_GICONV_H
#include <giconv.h>
#endif
-#endif
#ifdef HAVE_CTYPE_H
#include <ctype.h>