summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-10-06 10:58:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:13 -0500
commit1b80624c57cdd71a2f421ebe399416580d8d87b9 (patch)
tree7eca973717ac17116d3336b3ae49654084c9161a /source3
parenta856a88ba452b4951edbdfc696f1738e482860d7 (diff)
downloadsamba-1b80624c57cdd71a2f421ebe399416580d8d87b9.tar.gz
samba-1b80624c57cdd71a2f421ebe399416580d8d87b9.tar.bz2
samba-1b80624c57cdd71a2f421ebe399416580d8d87b9.zip
r19121: try to get rid of the difference between in system/iconv.h
between samba 3 and 4. metze (This used to be commit 04031a9fca037ad77cca0ba0da6801d5017521ba)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/replace/system/iconv.h22
1 files changed, 16 insertions, 6 deletions
diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h
index fcd3199680..abc2d6f4e1 100644
--- a/source3/lib/replace/system/iconv.h
+++ b/source3/lib/replace/system/iconv.h
@@ -22,17 +22,27 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
+#define HAVE_ICONV
+#endif
+
+#if !defined(HAVE_GICONV) && defined(HAVE_GICONV_H)
+#define HAVE_GICONV
+#endif
+
+#if !defined(HAVE_BICONV) && defined(HAVE_BICONV_H)
+#define HAVE_BICONV
+#endif
+
#ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV
+#if defined(HAVE_ICONV)
#include <iconv.h>
-#endif
-#ifdef HAVE_GICONV
+#elif defined(HAVE_GICONV)
#include <giconv.h>
-#endif
-#ifdef HAVE_BICONV
+#elif defined(HAVE_BICONV)
#include <biconv.h>
#endif
-#endif
+#endif /* HAVE_NATIVE_ICONV */
/* needed for some systems without iconv. Doesn't really matter
what error code we use */