summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-24 03:27:29 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-24 03:27:29 +0000
commita9ae0df3332270cc66cd9167564ff9ee93f23f44 (patch)
tree2de5a66e52fd391bd8d61321004df800c445b999 /source3
parente1d65985bef1d54546d0a40637a37d404146418f (diff)
downloadsamba-a9ae0df3332270cc66cd9167564ff9ee93f23f44.tar.gz
samba-a9ae0df3332270cc66cd9167564ff9ee93f23f44.tar.bz2
samba-a9ae0df3332270cc66cd9167564ff9ee93f23f44.zip
Iconv as seperate library fixes from HEAD
(This used to be commit 935c66f6a02c7ba764fbcc643a91833deb588bc0)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index d33c7d766a..e25ac4fef2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -393,8 +393,13 @@
#endif /* HAVE_SYS_SHM_H */
#ifdef HAVE_NATIVE_ICONV
+#ifdef HAVE_ICONV
#include <iconv.h>
#endif
+#ifdef HAVE_GICONV
+#include <giconv.h>
+#endif
+#endif
#if HAVE_KRB5_H
#include <krb5.h>